]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Wed, 16 Mar 2016 18:30:26 +0000 (19:30 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 16 Mar 2016 18:30:26 +0000 (19:30 +0100)
commitf6c950823f97eb96f9c484d69cabeef17dcb117d
tree7527efe83c7089fc6a9c0d0246277cbdb0a2802d
parent84a475e5897d5753c45b6cbb0a982893ee2cda1e
parent8eb05fd1bdc23d561a2c5394d0c4f76cd842516f
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora