Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

Browse source

...

This commit is contained in:

Roger Braun 2017-11-12 14:23:39 +01:00

parent d293ceb1b5 08bc316742

commit 5fc6e9d467

7 changed files with 347 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex

View file

File diff suppressed because one or more lines are too long