Merge branch 'master' of https://github.com/cmattoon/Pico

Conflicts: lib/pico.php
12 years ago · 8141ccaeb5
parent 10eeea80c1
commit 8141ccaeb5
1 changed files with 1 additions and 0 deletions
--- a/lib/pico.php
+++ b/lib/pico.php
@ -218,6 +218,7 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
+
                        // Ignore Emacs (and Nano) temp files
                        if (in_array(substr($page, -1), array('~','#'))) {
 			    unset($pages[$key]);