about summary refs log tree commit diff
path: root/app/controllers/settings/imports_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-08-07 20:04:22 +0200
committerGitHub <noreply@github.com>2019-08-07 20:04:22 +0200
commit86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch)
tree2e1b3be0201e53c96f05993f1295b0e97bb14166 /app/controllers/settings/imports_controller.rb
parent8400ddca7155005ab79485ed6054c04ea3ca5667 (diff)
parente8ad0a800616a1f95fd71ab8457869e716212ca0 (diff)
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/imports_controller.rb')
0 files changed, 0 insertions, 0 deletions