aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-30 19:56:51 -0600
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-30 19:56:51 -0600
commit8e752d09766da8b3ebb9ca9ba6f67be7168e63d1 (patch)
tree1858451087b52a8c3fad036e053cfd704d8feb8f /.gitignore
parent51d0aa406d40aa8dede624736f64f2ed055360b9 (diff)
parent111db0b6be5b8fc5881e1e383d5360b768f68845 (diff)
downloadikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar
ikiwiki-8e752d09766da8b3ebb9ca9ba6f67be7168e63d1.tar.gz
Merge branch 'master' into cvs
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index da2f4eb46..fe1c3d441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,3 @@ po/underlays/directives/ikiwiki/directive/*.mdwn
po/underlays_copy_stamp
underlays/locale
/t/tmp/
-doc/bugs/Pages_with_non-ascii_characters_like_*