]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ab967cf bfd5aea)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 1 Aug 2020 18:24:23 +0000 (20:24 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 1 Aug 2020 18:24:23 +0000 (20:24 +0200)
commit2cfa14296186913a7fead419dd6324ba42e3a446
tree2ab943a2bc96097b0b35f607334ae12d59c98ea4tree | snapshot
parentab967cf5a0980934a68a4a4852ad25d10eec778ecommit | diff
parentbfd5aea20686559f030ca0f2538bebc1943b398bcommit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/javascript/mastodon/locales/ja.json 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