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

ce6ca0fe

Commit ce6ca0fe authored 5 years ago by Alexander Strizhakov Committed by lain 5 years ago

Downloads
- Patches
- Plain Diff

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

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion

parent d089ff24

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
config/config.exs 4 additions, 2 deletions

config/config.exs
docs/config.md 1 addition, 0 deletions

docs/config.md
lib/mix/tasks/pleroma/user.ex 2 additions, 2 deletions

lib/mix/tasks/pleroma/user.ex
lib/pleroma/activity.ex 7 additions, 0 deletions

lib/pleroma/activity.ex
lib/pleroma/user.ex 18 additions, 12 deletions

lib/pleroma/user.ex
lib/pleroma/user_invite_token.ex 1 addition, 1 deletion

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

lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/user_test.exs 5 additions, 3 deletions

test/user_test.exs

with 40 additions and 21 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