]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e42626 85f0e0a)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 5 Apr 2020 16:32:06 +0000 (18:32 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 5 Apr 2020 16:32:06 +0000 (18:32 +0200)
commit9101254d0a70bc6f899c093f33300cffceb7c8ac
treec8e9e95a36ffb2346e3168d00364e4b614bee92atree | snapshot
parent6e426267a762f3cd1efa2c5fb120a13543567775commit | diff
parent85f0e0a606905ecda1322a0f7b65d8b4ff91dd69commit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
13 files changed:
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/javascript/core/public.js diff1 | | blob | history
app/javascript/flavours/glitch/packs/public.js diff1 | | blob | history
app/javascript/packs/public.js diff1 | diff2 | blob | history
app/models/status.rb diff1 | diff2 | blob | history
config/locales/ja.yml diff1 | diff2 | blob | history
config/locales/pl.yml diff1 | diff2 | blob | history
config/locales/simple_form.pl.yml diff1 | diff2 | blob | history
db/schema.rb 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