fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/config/webpack/rules
History
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
2019-03-16 20:59:33 +01:00
..
babel.js Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
css.js Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
file.js Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
index.js Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
mark.js Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
node_modules.js fix: update to emoji-mart 2.10.0 (#10281) 2019-03-16 20:13:15 +01:00