hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/settings
History
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
 		2017-09-09 23:56:21 -05:00
..
applications Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
deletes Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
exports Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
follower_domains Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
imports Optimize user setting page for mobile browser (#1924) 2017-04-17 10:37:00 +02:00
preferences Fix language filter codes (#4841) 2017-09-08 12:32:22 +02:00
profiles Merge that good fresh upstream shit 2017-07-22 01:16:53 +00:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
two_factor_authentications Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00