Benjamin Neff 03fe90ffaa Merge branch 'encrypted-salmon' into develop		2016-02-15 04:17:13 +01:00
..
diaspora_federation	Merge branch 'encrypted-salmon' into develop	2016-02-15 04:17:13 +01:00
tasks	fix release task	2015-07-10 02:13:17 +02:00
diaspora_federation.rb	add slap/magic-env switch to the receive-controller	2016-02-14 19:00:43 +01:00