Merge remote-tracking branch 'upstream/develop' into ap1
[friendica.git/.git] / VERSION
1 2018.12-dev