Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

61c16193

Commit 61c16193 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'move-backend-images' into 'develop'

Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60

parents 9a9766d6 c8a29315

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 2 additions, 2 deletions

lib/pleroma/user.ex
lib/pleroma/web/endpoint.ex 1 addition, 1 deletion

lib/pleroma/web/endpoint.ex
priv/static/images/avi.png 0 additions, 0 deletions

priv/static/images/avi.png
priv/static/images/banner.png 0 additions, 0 deletions

priv/static/images/banner.png
test/web/mastodon_api/account_view_test.exs 4 additions, 4 deletions

test/web/mastodon_api/account_view_test.exs
test/web/twitter_api/views/user_view_test.exs 8 additions, 8 deletions

test/web/twitter_api/views/user_view_test.exs

with 15 additions and 15 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment