about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-03-27 10:44:12 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-03-27 10:44:12 -0500
commitd2cdc2b5a37f9c9d56242e3540ff62cccff4b1ae (patch)
tree7a18011a34ee3f2c87c826797bf0443c5765d99e /app/controllers/settings
parent49c957bc3bf186b7e560d09d605f24693338c5db (diff)
parent3523aa440ba3f52bf28fe1e9707506d327c4431f (diff)
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions