diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 06:20:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 06:20:19 +0000 |
| commit | bc4f09b775c0224b273b5db96fabf6bf41bc9e32 (patch) | |
| tree | 08da9b33efea0309c353be245b6f90e5d75ebcd7 /src/components/settings/settings.js | |
| parent | 256aa25a11bbccd2af4f9efa55a6f3155377ab38 (diff) | |
| parent | c6913e3909e089225ade7aa4874bd1acbca5a5e4 (diff) | |
Merge branch 'serverside-frontend-configuration-2' into 'develop'
serverside-frontend-configuration-2
See merge request pleroma/pleroma-fe!312
Diffstat (limited to 'src/components/settings/settings.js')
0 files changed, 0 insertions, 0 deletions