diff options
| author | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 16:35:47 +0000 |
| commit | e1a1c8e7de5e10fa64d168dc5d35a80b96767395 (patch) | |
| tree | c0057448e323c730bea2c76cecf9efb85ef14181 /rel | |
| parent | 4a6389316dac53c1ca2ec36d160690476d881185 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-e1a1c8e7de5e10fa64d168dc5d35a80b96767395.tar.gz | |
Merge branch 'develop' into 'cleanup/masto_fe-default_settings'
# Conflicts:
# lib/pleroma/web/views/masto_fe_view.ex
Diffstat (limited to 'rel')
0 files changed, 0 insertions, 0 deletions