Benjamin Neff 530b534c42 Merge branch 'master' into develop		2016-01-23 03:01:00 +01:00
..
application_controller.rb	set locale=en to fix locale leakage from other requests	2016-01-23 02:32:41 +01:00
h_card_controller.rb	rename callbacks	2015-08-04 02:09:14 +02:00
receive_controller.rb	move Receiver to Federation module	2016-01-11 02:30:32 +01:00
webfinger_controller.rb	bump rubocop and pronto-rubocop	2016-01-19 01:32:22 +01:00