]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager
authorMichael <heluecht@pirati.ca>
Sun, 12 Mar 2017 20:52:14 +0000 (20:52 +0000)
committerMichael <heluecht@pirati.ca>
Sun, 12 Mar 2017 20:52:14 +0000 (20:52 +0000)
commit044e9a6603283b554d7864f0ad9a2a178979568b
tree80ff3d25e34127309b05854d907e2efd47cf1fb8
parent997e94555b1511b907662f688207f17d4ad868e2
parent7d1e54664a141919864e8b7dfa2ee4f4307fe6ad
Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager

Conflicts:
mod/profile.php
include/Contact.php
mod/profile.php