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

839cb7b4

Commit 839cb7b4 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' into 'mastopost'

# Conflicts:
#   .gitignore

parents b4292295 595ca3bb

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
config/config.exs 2 additions, 1 deletion

config/config.exs
lib/pleroma/web/activity_pub/activity_pub.ex 14 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 1 addition, 1 deletion

lib/pleroma/web/twitter_api/controllers/util_controller.ex
lib/pleroma/web/web_finger/web_finger.ex 46 additions, 34 deletions

lib/pleroma/web/web_finger/web_finger.ex

with 64 additions and 37 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