diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-12 11:54:39 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-12 11:54:39 +0400 |
| commit | 481bb831bb898399a01495fb6d3b07ca44a02f17 (patch) | |
| tree | bbc1bcc2ebd13ffb1d5ddad179f2b279fca15467 /.gitignore | |
| parent | e7d50617d7add1ac3bcd7ecfacf5dae76fea05b7 (diff) | |
| parent | 3abe68176ff09ca579ff9e5f15872fb5cab8ff4d (diff) | |
Merge branch 'master' into ext-fs-irods-master
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index 6259482c002..43f33783e39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ # the default generated dir + db file -data -owncloud -config/config.php -config/mount.php -apps/inc.php +/data +/owncloud +/config/config.php +/config/mount.php +/apps/inc.php # ignore all apps except core ones -apps* -!apps/files -!apps/files_encryption -!apps/files_external -!apps/files_sharing -!apps/files_trashbin -!apps/files_versions -!apps/user_ldap -!apps/user_webdavauth +/apps* +!/apps/files +!/apps/files_encryption +!/apps/files_external +!/apps/files_sharing +!/apps/files_trashbin +!/apps/files_versions +!/apps/user_ldap +!/apps/user_webdavauth # ignore themes except the README -themes/* -!themes/README +/themes/* +!/themes/README # just sane ignores .*.sw[po] @@ -76,7 +76,7 @@ nbproject /tests/phpunit.xml # Tests - auto-generated files -data-autotest +/data-autotest /tests/coverage* /tests/autoconfig* /tests/autotest* |