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

a26d5e6b

Commit a26d5e6b authored 6 years ago by kaniini

Downloads
- Plain Diff

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

rich text support

See merge request pleroma/pleroma!309

parents e8389694 e7871ed0

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 5 additions, 1 deletion

lib/pleroma/formatter.ex
lib/pleroma/web/common_api/common_api.ex 8 additions, 1 deletion

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex 30 additions, 4 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 1 addition, 0 deletions

mix.exs
mix.lock 1 addition, 0 deletions

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

test/web/common_api/common_api_test.exs

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