David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master		2017-11-16 22:52:37 -06:00
..
exports	…
two_factor_authentication	…
applications_controller_spec.rb	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
deletes_controller_spec.rb	…
exports_controller_spec.rb	…
follower_domains_controller_spec.rb	Fix order of paginated accounts in FollowerDomainsController and spec (#3357)	2017-09-30 23:06:09 +02:00
imports_controller_spec.rb	…
keyword_mutes_controller_spec.rb	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
notifications_controller_spec.rb	Separate notifications preferences from general preferences (#4447)	2017-10-04 10:22:52 +02:00
preferences_controller_spec.rb	Separate notifications preferences from general preferences (#4447)	2017-10-04 10:22:52 +02:00
profiles_controller_spec.rb	ActivityPub delivery (#4566)	2017-08-13 00:44:41 +02:00
two_factor_authentications_controller_spec.rb	…