about summary refs log tree commit diff
path: root/.rspec
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-27 13:20:15 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-27 13:20:15 +0200
commit659b8a12ece7110608ee84748e57647c08d1dbda (patch)
tree1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /.rspec
parentc2e528916cae422baee3d72a3b4409a23c476b3f (diff)
parent63c7b9157274f57c496399a1a5c728b32415034c (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
Diffstat (limited to '.rspec')
0 files changed, 0 insertions, 0 deletions