cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

author	Thibaut Girka <thib@sitedethib.com>
	Fri, 13 Nov 2020 23:30:36 +0000 (00:30 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Fri, 13 Nov 2020 23:30:36 +0000 (00:30 +0100)
commit	de5cc20dd8e15eb7e90d65392a6e6f9145746913
tree	2391ed3e8c3cb95c50d7e5fe3d35b36148989cb7	tree \| snapshot
parent	8ffae82fa61385a33f819e037aa741d0b3e99187	commit \| diff
parent	0a4d0e8320ae9fc5c446828743008db3b45bcb13	commit \| diff

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict caused because of glitch-soc's theming system.
  Took upstream's new code and applied the theming system changes on top
  of it.

source code fur Kibicat Mastodon

RSS Atom

app/controllers/auth/sessions_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/concerns/sign_in_token_authentication_concern.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/concerns/two_factor_authentication_concern.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
streaming/index.js	diff1 \|	diff2 \|	blob \| history