diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-15 20:43:39 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-15 20:43:39 +0200 |
| commit | 2f1a06b2ee8b2022e71d8903fd5ce0ccf2f8c22f (patch) | |
| tree | c65a39fe8bd0327b7187d3f8726de9f107ba473d | |
| parent | 66576de1b701cbf635b0ef3231497bd6bd1898ee (diff) | |
| download | nextcloud-server-2f1a06b2ee8b2022e71d8903fd5ce0ccf2f8c22f.tar.gz nextcloud-server-2f1a06b2ee8b2022e71d8903fd5ce0ccf2f8c22f.zip | |
merged gitignores
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | config/.gitignore | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index e0ea724f1ae..33f8e0c524b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # the default generated dir + db file data owncloud +config/config.php # just sane ignores .*.sw[po] diff --git a/config/.gitignore b/config/.gitignore deleted file mode 100755 index d09f42a2389..00000000000 --- a/config/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -#autogenerated -config.php |