]> git.mxchange.org Git - friendica.git/commit
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)
commit2e9d233367068fceac8005126d14a2002539c772
tree1e227ecf1540f9a0ba4c99fe8f8822dc217142bc
parent0a49b7dc77048c2b46c030eb09906b0d82e65ba7
parentc18d17e65b37ab3af7db59be0e0cc80c04c1612e
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
boot.php
.htaccess