-
- Downloads
Merge branch 'merge/20190517' into 'mfc-develop'
Merge/20190517 Closes pleroma/pleroma-fe#533 and pleroma/pleroma#903 See merge request mfc/pleroma!26
No related branches found
No related tags found
Showing
- .gitignore 4 additions, 0 deletions.gitignore
- .gitlab-ci.yml 18 additions, 2 deletions.gitlab-ci.yml
- CHANGELOG.md 18 additions, 4 deletionsCHANGELOG.md
- COPYING 8 additions, 0 deletionsCOPYING
- README.md 1 addition, 1 deletionREADME.md
- config/config.exs 14 additions, 20 deletionsconfig/config.exs
- config/test.exs 8 additions, 0 deletionsconfig/test.exs
- docs/api/admin_api.md 298 additions, 21 deletionsdocs/api/admin_api.md
- docs/api/differences_in_mastoapi_responses.md 10 additions, 0 deletionsdocs/api/differences_in_mastoapi_responses.md
- docs/api/pleroma_api.md 9 additions, 0 deletionsdocs/api/pleroma_api.md
- docs/config.md 23 additions, 1 deletiondocs/config.md
- docs/installation/debian_based_en.md 2 additions, 1 deletiondocs/installation/debian_based_en.md
- docs/installation/debian_based_jp.md 2 additions, 1 deletiondocs/installation/debian_based_jp.md
- docs/introduction.md 18 additions, 18 deletionsdocs/introduction.md
- lib/mix/tasks/pleroma/conversations.ex 0 additions, 23 deletionslib/mix/tasks/pleroma/conversations.ex
- lib/mix/tasks/pleroma/database.ex 26 additions, 2 deletionslib/mix/tasks/pleroma/database.ex
- lib/mix/tasks/pleroma/emoji.ex 6 additions, 6 deletionslib/mix/tasks/pleroma/emoji.ex
- lib/mix/tasks/pleroma/user.ex 20 additions, 1 deletionlib/mix/tasks/pleroma/user.ex
- lib/pleroma/activity.ex 27 additions, 10 deletionslib/pleroma/activity.ex
- lib/pleroma/bbs/handler.ex 0 additions, 1 deletionlib/pleroma/bbs/handler.ex
Loading
Please register or sign in to comment