]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean
authorMichael Vogel <icarus@dabo.de>
Mon, 30 May 2016 05:24:06 +0000 (07:24 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 30 May 2016 05:24:06 +0000 (07:24 +0200)
commit52186671966e34c1ad5e31c36dbb07da524d1bdf
tree00bba752cc33128160f44b141255cee170a05662
parentecb67feca1bbb331dc501ec7ca0e7e03e0ead32d
parentb2c6bf00783783c6df37c3eb19707e2fc2b6ae4d
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean