]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13df125 44d5c6b)
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sat, 5 Dec 2020 16:33:29 +0000 (17:33 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Sat, 5 Dec 2020 16:33:37 +0000 (17:33 +0100)
commitf8d867bac43e7e18d293ac32a9be597d1f46dce3
treeb3d950a01a8dee5403081f56cf0c6b0571954e90tree | snapshot
parent13df125b6c75923ccc21a5c57053e680cea75f38commit | diff
parent44d5c6bc8ffd92cd201380dabe35748e50b6af68commit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
13 files changed:
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/helpers/application_helper.rb diff1 | diff2 | blob | history
app/javascript/mastodon/features/compose/components/compose_form.js diff1 | diff2 | blob | history
app/javascript/mastodon/locales/defaultMessages.json diff1 | diff2 | blob | history
app/javascript/mastodon/locales/ja.json diff1 | diff2 | blob | history
app/javascript/mastodon/locales/pl.json diff1 | diff2 | blob | history
app/javascript/styles/mastodon/components.scss diff1 | diff2 | blob | history
app/services/remove_status_service.rb diff1 | diff2 | blob | history
app/views/statuses/_simple_status.html.haml diff1 | diff2 | blob | history
lib/mastodon/version.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon