mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-29 14:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/views/admin/settings
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
..
edit.html.haml Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00