]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a49b7d c18d17e)
Merge remote-tracking branch 'upstream/master' into develop
authorMichael Vogel <icarus@dabo.de>
Thu, 21 Jul 2016 20:48:34 +0000 (22:48 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 21 Jul 2016 20:48:34 +0000 (22:48 +0200)
Conflicts:
boot.php

1  2 
.htaccess patch | diff1 | diff2 | blob | history

diff --cc .htaccess
Simple merge
Unnamed repository; edit this file 'description' to name the repository.