]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9a998f 158c31b)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 20 Mar 2019 12:54:00 +0000 (13:54 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 20 Mar 2019 12:54:00 +0000 (13:54 +0100)
commit1d6152f4404d40a6113bad2e70326fb5c2145ef4
tree4edcc500883b3e533c06517b147bf221b06f6bf0tree | snapshot
parentb9a998f201913dd1c89ddcb0c4c9e181eb73bfcfcommit | diff
parent158c31b9df538691666e5b91f48a0afecd2985fecommit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/models/concerns/account_associations.rb diff1 | diff2 | blob | history
config/application.rb diff1 | diff2 | blob | history
config/locales/en.yml diff1 | diff2 | blob | history
config/navigation.rb diff1 | diff2 | blob | history
config/routes.rb diff1 | diff2 | blob | history
db/schema.rb diff1 | diff2 | blob | history
source code fur Kibicat Mastodon