about summary refs log tree commit diff
path: root/app/lib/settings
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 03:23:57 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 03:23:57 -0500
commitda70208b452bf751af92128ec46eea9707e1e6a9 (patch)
treed969e5e6092b5cd00ca8db5b12f83130dec4a010 /app/lib/settings
parent2d392fb3b80c04df5c575d72e4f7424a84909300 (diff)
parentc61ddd82495f8997fc3034faa8281165f553280c (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/lib/settings')
0 files changed, 0 insertions, 0 deletions