diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-03-31 19:33:17 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-03-31 19:33:17 +0000 |
commit | 5fa8237bc1dcabca050dc5d8d9325fec649e1723 (patch) | |
tree | cac60d44906c1f478d70d5897437656d540f75b9 /installation/pleroma.nginx | |
parent | 86525e3a345d79b3ab3dcece72e6f6bc8f7af961 (diff) | |
parent | 7f2174d81160b1e61b2a69b008575df3b2475f4b (diff) | |
download | pleroma-5fa8237bc1dcabca050dc5d8d9325fec649e1723.tar.gz pleroma-5fa8237bc1dcabca050dc5d8d9325fec649e1723.zip |
Merge branch 'new-mastofe' into 'develop'
Bring Mastodon frontend up-to-date
See merge request pleroma/pleroma!87
Diffstat (limited to 'installation/pleroma.nginx')
0 files changed, 0 insertions, 0 deletions