diff options
| author | LEDfan <tobia@ledfan.be> | 2016-01-13 12:42:16 +0300 |
|---|---|---|
| committer | LEDfan <tobia@ledfan.be> | 2016-01-13 12:42:16 +0300 |
| commit | b292c05788e6c95a30f3c6f10309f62a15115b4b (patch) | |
| tree | 9a1ac56a7bb3573bf5ac311e76713cd1701cf522 /.gitignore | |
| parent | bc54607ff521c2cb683903386a43178d3b1024ac (diff) | |
| parent | 06b1d77280dce50449005d64649e41c4942f38bc (diff) | |
Merge branch 'master' into ledfan_xmpp_oc
Conflicts:
.gitignore
appinfo/info.xml
appinfo/version
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,4 +11,4 @@ css/ # Composer composer.phar -vendor/
\ No newline at end of file +vendor/ |