about summary refs log tree commit diff
path: root/public/emoji/1f489.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-21 16:40:02 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-21 16:40:02 +0200
commita4c9bda771c04526005f708dfb9ca2ccced60d52 (patch)
tree9ed60f78e2e8acc823bccb7c75ecaa3fdb1b7ab6 /public/emoji/1f489.svg
parent98ecadbf99aa823164608f796a40ab1cd067bdc2 (diff)
parent46061dc041b0a2a4a3907976cc3432abdb1d67ec (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/locales/en.yml
	config/locales/fr.yml
	config/locales/simple_form.pl.yml
	config/themes.yml

Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
Diffstat (limited to 'public/emoji/1f489.svg')
0 files changed, 0 insertions, 0 deletions