kaniini 131f883207 Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129		2019-05-11 16:52:26 +00:00
..
bbs	BBS: Credo fixes.	2019-05-04 15:47:50 +02:00
captcha
config
conversation
emails	Merge develop to 788-separate-email-addresses	2019-04-13 12:24:38 +07:00
gopher
http
instances
object	containment: remove pointless moduledoc line	2019-05-07 16:11:22 +00:00
plugs	Standardize construction of websocket URL	2019-05-03 11:45:04 +00:00
upload
uploaders
user	Merge develop	2019-05-08 14:34:36 +00:00
web	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'	2019-05-11 16:52:26 +00:00
activity.ex	Merge develop	2019-05-08 14:34:36 +00:00
application.ex
bookmark.ex	Remove bookmarks assoc and add a fake bookmark assoc instead	2019-05-07 19:33:22 +00:00
clippy.ex
config.ex
conversation.ex	Streamer: Stream out Conversations/Participations.	2019-05-03 13:39:14 +02:00
emoji.ex
filter.ex
flake_id.ex
formatter.ex	formatter.ex: Add get_emoji_map/1	2019-05-03 16:27:50 +02:00
html.ex	Pleroma.Formatter: width/height to class=emoji	2019-05-03 16:25:58 +02:00
instances.ex
list.ex
mime.ex
notification.ex
object_tombstone.ex	Revert Activity tombstones, add ObjectTombstone struct	2018-12-25 03:00:06 +03:00
object.ex
pagination.ex
PasswordResetToken.ex
registration.ex
repo.ex	fix format	2019-05-06 17:51:03 +00:00
reverse_proxy.ex
scheduled_activity_worker.ex
scheduled_activity.ex
stats.ex	Merge develop	2019-05-08 14:34:36 +00:00
thread_mute.ex
upload.ex	Remove H1 in @moduledoc	2019-05-06 04:53:12 +02:00
user_invite_token.ex	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00
user.ex	Merge develop	2019-05-08 14:34:36 +00:00