]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 615073d 5524258)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 15 Apr 2020 15:07:49 +0000 (17:07 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 15 Apr 2020 15:07:49 +0000 (17:07 +0200)
commit66ad30db489ddb2b3ecc98d284aabd47c9d4ae84
treed8f035139c20e59c39bb35a74686783094c297datree | snapshot
parent615073df33b9a4317ac5c93fdef83c9cd34567facommit | diff
parent5524258da9bc1d62b1396d19c672d3a8335ffbc5commit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/models/user.rb diff1 | diff2 | blob | history
config/locales/en.yml diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon