about summary refs log tree commit diff
path: root/.dockerignore
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-29 14:00:41 +0100
committerThibaut Girka <thib@sitedethib.com>2018-10-29 14:00:41 +0100
commita942ad3062285b6b4984fe92f9bd610829f04456 (patch)
tree2476b65436959dda09871ee96edca53b53201b96 /.dockerignore
parent7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff)
parent32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
Diffstat (limited to '.dockerignore')
0 files changed, 0 insertions, 0 deletions