diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
| commit | 4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch) | |
| tree | 7c90513d2576dba9d71ac069ca28ac7e4db72a28 /app/views/layouts/embedded.html.haml | |
| parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
| parent | 735b8be2042a29fb10077aaab526832b95a041a9 (diff) | |
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.
Diffstat (limited to 'app/views/layouts/embedded.html.haml')
0 files changed, 0 insertions, 0 deletions