summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-14 18:59:57 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-14 18:59:57 +0200
commite06edb350878c1c1414e243df23b789a6266d2d3 (patch)
treed0b61c39216c674225d0e8faea1710dc1c34fe8c /.gitignore
parent2b7136af76f5020af7a09342037ef4858472d58f (diff)
parent00d14a048bfbcc85c905ab2c22b122e63c1de8d3 (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved): .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 6787fff..83d0833 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
/basewiki_l10n
/basewiki_nonedit_l10n
-/content
/content_l10n
/content_dummy
/content_dummy_da