Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

d31bbb1c

Commit d31bbb1c authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'revert-a26d5e6b' into 'develop'

Revert "Merge branch 'feature/rich-text' into 'develop'"

See merge request pleroma/pleroma!313

parents 340ab3cb 58539e13

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/formatter.ex 1 addition, 5 deletions

lib/pleroma/formatter.ex
lib/pleroma/web/common_api/common_api.ex 1 addition, 8 deletions

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex 4 additions, 30 deletions

lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 1 addition, 1 deletion

lib/pleroma/web/twitter_api/twitter_api_controller.ex
mix.exs 0 additions, 1 deletion

mix.exs
mix.lock 0 additions, 1 deletion

mix.lock
test/web/common_api/common_api_test.exs 0 additions, 32 deletions

test/web/common_api/common_api_test.exs

with 7 additions and 78 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