Eugen Rochko 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master		2017-04-11 20:43:56 +02:00
..
exports_controller.rb	Clean up generation of account webfinger string (#1477)	2017-04-10 22:58:06 +02:00
imports_controller.rb	Import feature for following/blocking lists (addresses #62, #177, #201, #454)	2017-03-30 19:42:33 +02:00
preferences_controller.rb	Allow user to disable the boost confirm dialog in preferences	2017-04-11 10:10:16 -04:00
profiles_controller.rb	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
two_factor_auths_controller.rb	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)	2017-04-08 22:20:08 +02:00