diff options
author | Nicolas Frandeboeuf <nicofrand@gmail.com> | 2013-08-22 00:57:11 +0200 |
---|---|---|
committer | Nicolas Frandeboeuf <nicofrand@gmail.com> | 2013-08-22 00:57:11 +0200 |
commit | 57c91e427d20d520bc506bef52189a86d72a9255 (patch) | |
tree | 43fbcf6eac2fc1a913c796a5631a7ba874af9693 /.gitignore | |
parent | 2bf93dc0345e304656ed9a931f9941fd7117ddfe (diff) | |
parent | 746f93c290881d97997b8179395de2875eb57c71 (diff) | |
download | wallabag-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-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,4 +3,4 @@ composer.phar | |||
3 | db/poche.sqlite | 3 | db/poche.sqlite |
4 | output | 4 | output |
5 | phpdoc* | 5 | phpdoc* |
6 | inc/config/myconfig.inc.php \ No newline at end of file | 6 | inc/poche/myconfig.inc.php \ No newline at end of file |