about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-04-15 17:07:49 +0200
committerThibaut Girka <thib@sitedethib.com>2020-04-15 17:07:49 +0200
commit66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (patch)
treed8f035139c20e59c39bb35a74686783094c297da /app/controllers/settings
parent615073df33b9a4317ac5c93fdef83c9cd34567fa (diff)
parent5524258da9bc1d62b1396d19c672d3a8335ffbc5 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions