diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 13:52:55 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 14:14:20 +0100 |
| commit | 4df3b7cb067797982199c3e613ba32a9c7474348 (patch) | |
| tree | bf237d385411f73e670af4c744d8239ab4799434 /app/views/public_timelines/show.html.haml | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/follower_domains_controller.rb Removed upstream. Did the same here. Maybe we should not have? - config/locales/en.yml Upstream removed the “Authorized followers” page and associated translations. This is too close in the file to our glitch-soc-specific “flavour” string. No actual conflict. - config/locales/ja.yml Same as above. - config/locales/pl.yml Same as above. - config/navigation.rb No real conflict. New route added too close to the glitch-soc-specific “flavours” one. - config/webpack/configuration.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpack/loaders/babel.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. The contents of this file have been moved to package.json. - config/webpack/shared.js Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - config/webpacker.yml Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - jest.config.js The contents of this file have been moved to package.json. - package.json Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up. - yarn.lock Upstream refactored the webpack(er) configuration quite a bit. Tried to keep up.
Diffstat (limited to 'app/views/public_timelines/show.html.haml')
0 files changed, 0 insertions, 0 deletions