Merge branch 'update/pleroma-fe-20180824' into 'develop'
[akkoma] / priv / static / packs / icon_done-12b87c12f915597dccbd2ca4d7167ba4.png
2018-05-06 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-10 lambdaMerge branch 'feld-varnish' into 'develop'
2018-04-02 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-04-01 KANEKO YoshitakaFix conflict
2018-03-31 lambdaMerge branch 'new-mastofe' into 'develop'
2018-03-31 Morgan BazalgetteBring Mastodon frontend up-to-date