djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-14 11:43:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/layouts
History
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master 
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
..
_theme.html.haml
Various fixes
2017-12-04 21:58:10 -08:00
admin.html.haml
Merge branch 'master' into glitch-soc/master
2019-12-19 13:52:54 +01:00
application.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
auth.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
embedded.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-22 17:51:38 +02:00
error.html.haml
Fix static error page to use the correct pack
2019-02-17 13:34:40 +01:00
mailer.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-10 18:59:53 +02:00
mailer.text.erb
Replace tutorial modal with welcome e-mail (#6273)
2018-01-18 19:17:25 +01:00
modal.html.haml
Revert Font Awesome 5 upgrade (#8810)
2018-09-28 02:11:14 +02:00
plain_mailer.html.haml
HTML e-mails for UserMailer (#6256)
2018-01-16 03:29:11 +01:00
public.html.haml
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00