Merge branch 'ap-connect' of github.com:annando/friendica into ap-connect
authorMichael <heluecht@pirati.ca>
Fri, 3 May 2019 05:55:19 +0000 (05:55 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 3 May 2019 05:55:19 +0000 (05:55 +0000)
commit30a6211d5c160732c6d0219cfa51474b9824620e
tree6999398ca7d71b8d72177cb80dcefd62b3d18de6
parentb1222e174ebd03ccf3fcf6e6c4ba832211c9d7ea
parent56d2df04f0a275016ad234e9b8dd8118593c60c9
Merge branch 'ap-connect' of github.com:annando/friendica into ap-connect