]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aff941 45c41e2)
Merge branch 'master' into master
authormbi <knox@users.noreply.github.com>
Wed, 30 Dec 2015 09:34:42 +0000 (10:34 +0100)
committermbi <knox@users.noreply.github.com>
Wed, 30 Dec 2015 09:34:42 +0000 (10:34 +0100)
1  2 
.htaccess patch | diff1 | diff2 | blob | history

diff --cc .htaccess
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server