Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Thu, 16 Feb 2017 03:00:02 +0000 (22:00 -0500)
commitbe7041c3e06ee5a799851ac3612849dde55a8198
treefb6b0d29a04be530ab392eccdae29c2e947e0614
parentcb37dfd0a1d54214c55a8555ad2812fb8e2b0202
parent2536bd4f56af7dac323a62a13a68bbb32980a5e1
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop