diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-07-31 22:21:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 00:18:13 +0200 |
commit | c1c514ca703f3e11adfe41734345b5277e886c50 (patch) | |
tree | d8e088898292ca6da0f979b9244781b2ce116c7e /package.json | |
parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
parent | 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index aeec3c72c..3f6f4c7fd 100644 --- a/package.json +++ b/package.json @@ -106,6 +106,7 @@ "redux": "^3.7.1", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", + "rellax": "^1.6.2", "requestidlecallback": "^0.3.0", "reselect": "^3.0.1", "rimraf": "^2.6.1", |