]> cat aescling's git repositories - mastodon.git/commit
cat aescling's git repositories / mastodon.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d42e7e0 11d6031)
Merge branch 'master' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 11 Jan 2021 10:55:42 +0000 (11:55 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 11 Jan 2021 10:55:42 +0000 (11:55 +0100)
commit33d30632fb627ba1742eff3e0c5fc84ccd156cdb
treeb7c15bb354c9d2f0ef25c50ab387007703f599d6tree | snapshot
parentd42e7e01dcd464f80637682d4eee6e5a7f36f26ecommit | diff
parent11d603101a7b3389c679b8c155a3cb06203ca31acommit | diff
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.
Gemfile diff1 | diff2 | blob | history
Gemfile.lock diff1 | diff2 | blob | history
app/models/account.rb diff1 | diff2 | blob | history
app/models/public_feed.rb diff1 | diff2 | blob | history
app/models/status.rb diff1 | diff2 | blob | history
app/models/tag_feed.rb diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
yarn.lock diff1 | diff2 | blob | history
source code fur Kibicat Mastodon