about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-08-07 22:43:52 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-08-07 22:43:52 +0200
commit7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch)
tree36fbf6f3d2019cc345d33fe555569ec750a66957 /app/controllers/settings
parentb8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff)
parenta3e53bd442752f210db2025f2dfc45e7599354c2 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions