about summary refs log tree commit diff
path: root/scalingo.json
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-01 21:28:31 +0200
committerThibaut Girka <thib@sitedethib.com>2019-04-01 21:28:31 +0200
commit12dae9d58316bec32adaac016998ab1cf69d2b45 (patch)
tree4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /scalingo.json
parent925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff)
parent120544067fcca4bf6e71ba1ffb276c451c17c656 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
Diffstat (limited to 'scalingo.json')
0 files changed, 0 insertions, 0 deletions