about summary refs log tree commit diff
path: root/app/views/admin/instances
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-10-21 02:37:20 -0500
committerFire Demon <firedemon@creature.cafe>2020-10-21 02:37:20 -0500
commit8e0ae20e607775840e94605f71c5c480cfa97ddf (patch)
tree0016cd08f4504ebd66149240b406c34e383c3332 /app/views/admin/instances
parent974b3805b7d6dd27730846847e19bc4204f16dc6 (diff)
parent29870d2be6c0e78132416b5561aba20d6ca3c746 (diff)
Merge remote-tracking branch 'upstream/master' into dev
Diffstat (limited to 'app/views/admin/instances')
0 files changed, 0 insertions, 0 deletions