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	Claire <claire.github-309c@sitedethib.com>
	Fri, 12 Feb 2021 09:28:32 +0000 (10:28 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Fri, 12 Feb 2021 09:28:32 +0000 (10:28 +0100)
commit	5e11f3a6e1de864da8a7e694f18eaa3b5e4c7379
tree	f0dc221cad560933a921fc2b4d85fad065a7601a	tree \| snapshot
parent	a30a40c4379b26890b6453083ef213e672658902	commit \| diff
parent	15ced8728ff89932e3f8febf119f63c78ac9a960	commit \| diff

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

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
Vagrantfile	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/views/layouts/modal.html.haml	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
Vagrantfile	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/views/layouts/modal.html.haml	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history