Merge develop
authorRoman Chvanikov <chvanikoff@gmail.com>
Tue, 30 Apr 2019 13:17:52 +0000 (20:17 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Tue, 30 Apr 2019 13:17:52 +0000 (20:17 +0700)
commit0f0cc2703b7ffb99c58e72782925ea4dd61db41d
treef640d180d16797a6da98a7d1e1cb7c6fb6350392
parentb87ad13803df59d88feb736c3d0ff9cf514989d7
parent32a4501d2d1cdfef68cbde236482e0c84cce3a7a
Merge develop
.gitignore
config/config.exs
docs/config.md
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/user/info.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock
test/notification_test.exs
test/user_test.exs