spc-pleroma/lib/pleroma
Egor Kislitsyn 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
#	docs/config.md
2019-01-09 16:56:31 +07:00
..
captcha Merge branch 'captcha' into 'develop' 2019-01-03 17:04:27 +00:00
emails update copyright years to 2019 2018-12-31 15:41:47 +00:00
gopher update copyright years to 2019 2018-12-31 15:41:47 +00:00
http Merge remote-tracking branch 'origin/develop' into pool-usage 2019-01-01 14:19:55 +01:00
plugs update copyright years to 2019 2018-12-31 15:41:47 +00:00
upload update copyright years to 2019 2018-12-31 15:41:47 +00:00
uploaders update copyright years to 2019 2018-12-31 15:41:47 +00:00
user Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-09 16:56:31 +07:00
web Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts 2019-01-08 16:32:07 +07:00
PasswordResetToken.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
activity.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
application.ex rich media: use cachex to avoid flooding remote servers 2019-01-04 23:32:01 +00:00
config.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
emoji.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
filter.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
formatter.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
html.ex oopsies 2019-01-05 00:25:31 +01:00
list.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
mime.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
notification.ex Add check to prevent multiple follow notifications from the same user 2019-01-05 22:54:25 +00:00
object.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
object_tombstone.ex Revert Activity tombstones, add ObjectTombstone struct 2018-12-25 03:00:06 +03:00
repo.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
reverse_proxy.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
stats.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
upload.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00
user.ex Merge branch 'hotfix/media-proxy-uri' into 'develop' 2019-01-09 07:09:39 +00:00
user_invite_token.ex update copyright years to 2019 2018-12-31 15:41:47 +00:00