Merge remote-tracking branch 'upstream/develop' into update-self
[friendica.git/.git] / VERSION
1 2018-05-dev