Merge branch 'master' of github.com:photo/frontend

jmathai · jmathai · commit 080c8e0cb24d · 2013-05-16T14:15:32.000-07:00
diff --git a/documentation/guides/InstallationFreeBSDNginx.markdown b/documentation/guides/InstallationFreeBSDNginx.markdown
@@ -47,7 +47,7 @@ SUHOSIN
 MULTIBYTE
 MAILHEAD
 
-    cd /usr/port/lang/php5-extentions
+    cd /usr/port/lang/php5
     make config install clean distclean
 
 ##### Install php5 extentions
diff --git a/src/html/assets/themes/beisel2.0/templates/albums.php b/src/html/assets/themes/beisel2.0/templates/albums.php
@@ -35,4 +35,4 @@
       </ul>
     </div>
   </div>
-ç
+<?php } ?>

-Original file line number
+Diff line change
       </ul>
     </div>
   </div>
 -ç
 +<?php } ?>