]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2469645 41b38b0)
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 25 Nov 2020 14:31:45 +0000 (15:31 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 25 Nov 2020 14:31:45 +0000 (15:31 +0100)
commite71b16ae2b5623dc664c79ffa7d96282af662c78
treedb77dc96f03d7e9b51e33b379dd1f1b9bebc0343tree | snapshot
parent24696458bf22c8529b49f89b2791e3e07583b7e0commit | diff
parent41b38b027396d50cac2cf995f2b5830c2cf592facommit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/javascript/styles/mastodon/components.scss diff1 | diff2 | blob | history
app/models/account.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
streaming/index.js diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon