aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorNicolas Frandeboeuf <nicofrand@gmail.com>2013-08-22 00:57:11 +0200
committerNicolas Frandeboeuf <nicofrand@gmail.com>2013-08-22 00:57:11 +0200
commit57c91e427d20d520bc506bef52189a86d72a9255 (patch)
tree43fbcf6eac2fc1a913c796a5631a7ba874af9693 /.gitignore
parent2bf93dc0345e304656ed9a931f9941fd7117ddfe (diff)
parent746f93c290881d97997b8179395de2875eb57c71 (diff)
downloadwallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.gz
wallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.zst
wallabag-57c91e427d20d520bc506bef52189a86d72a9255.zip
Merge branch 'dev' of https://github.com/nicofrand/poche into dev
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 17af57cf..d190a8b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ composer.phar
3db/poche.sqlite 3db/poche.sqlite
4output 4output
5phpdoc* 5phpdoc*
6inc/config/myconfig.inc.php \ No newline at end of file 6inc/poche/myconfig.inc.php \ No newline at end of file