Merge branch 'develop' into oauth2
authorRoger Braun <roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000 (20:54 +0200)
committerRoger Braun <roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000 (20:54 +0200)
commitf0d41a3abf3e584c90c96644f73d533ea0680237
treed389818eff185ca584449f2fb47ad7c1254fa3af
parent464c33e9a1daf0477be050209043d2c26943d1fd
parent95aa6a3c651fed9810889d3446f2a1d710efb55e
Merge branch 'develop' into oauth2