about summary refs log tree commit diff
path: root/Vagrantfile
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-25 18:59:02 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-25 18:59:02 +0200
commit11cc2e099ae44a73a1a3e1aa606d607551d3d021 (patch)
tree2bb72be7d5db25ca5f1ae7ff6cf5944d419f4922 /Vagrantfile
parent9b75a1310420fdacaf2831585394635a01eef9e5 (diff)
parentc7ac0396975ba8f8c46edbd504d0ce1c582d1a4b (diff)
Merge branch 'master' into glitch-soc/merge-master
Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss
Diffstat (limited to 'Vagrantfile')
0 files changed, 0 insertions, 0 deletions