tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master'

Browse Source
This commit is contained in:
David Yip
2017-11-27 22:33:26 -06:00
parent 8bad6bdd00 706e534455
commit 7463d80ff4
11 changed files with 195 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/settings/profiles/show.html.haml
View File

@ -21,3 +21,8 @@
.actions
= f.button :button, t('generic.save_changes'), type: :submit
%hr/
%h6= t('auth.migrate_account')
%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)