Merge remote-tracking branch 'upstream/master' into contact-discovery
[friendica.git/.git] / VERSION
1 2019.06