3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon-docker-playground/app/javascript
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
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours Fix various issues caused by wrong `unread` key being updated 2019-12-17 15:55:10 +01:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
packs Admin setting to disable default follows (#12566) 2019-12-16 23:55:50 +01:00
skins
…
styles Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00