about summary refs log tree commit diff
path: root/nanobox/nginx-web.conf.erb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-19 22:41:10 +0200
committerThibaut Girka <thib@sitedethib.com>2018-05-19 22:41:10 +0200
commitb481e4fac1c564b8008f6f1d0eea1727ec9faa08 (patch)
tree6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /nanobox/nginx-web.conf.erb
parent625c4f36ef394215e65e19157bfaf60e7de94b5f (diff)
parent6aa5ea1b5dff54941682cb006ac2b11ab7b77988 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	config/locales/simple_form.ja.yml
Diffstat (limited to 'nanobox/nginx-web.conf.erb')
0 files changed, 0 insertions, 0 deletions