]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba
authorMichael <heluecht@pirati.ca>
Sat, 13 May 2017 04:13:07 +0000 (04:13 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 13 May 2017 04:13:07 +0000 (04:13 +0000)
commite884090efa4d0934a02e6844c97bbf54cdcc9c13
treea5a4e1fe37ec0f3e50d68357d1fdaec8b5250009
parent74a0a927420bf42eb82fd737c9d306efc365dd01
parent2bbcbdc7041843bf1e0f116b0d59b371e670daf9
Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

Conflicts:
include/uimport.php
include/uimport.php