diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-21 17:05:08 +0400 |
| commit | 6ff96b34ad0462ad05c34633ccd08236b93bf195 (patch) | |
| tree | 1acd7eb869d512b5a3fc9502961a98591ea20cfa /.gitignore | |
| parent | e139f7c863d5971a6386070148496cb0f70ad04e (diff) | |
| parent | 37af74efb3e3511b2d6eacef67dc90f22a685bd3 (diff) | |
Merge branch 'master' into load-apps-proper-master
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 25cb1b227f9..e61ec6f0359 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /data /owncloud /config/config.php +/config/*.config.php /config/mount.php /apps/inc.php |