Ivan Tashkinov 37925cbe78 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex		2019-04-02 14:05:34 +03:00
..
captcha
config
emails	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
gopher	change Repo.get(Activity, id) => Activity.get_by_id(id)	2019-04-02 16:50:31 +07:00
http
instances
plugs
upload
uploaders
user
web	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-02 14:05:34 +03:00
activity.ex
application.ex	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
clippy.ex
config.ex
emoji.ex
filter.ex
flake_id.ex	Fix account lookup for nicknames beginning with numbers	2019-04-02 10:51:33 +00:00
formatter.ex
html.ex
instances.ex
list.ex	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
mime.ex
notification.ex
object.ex
object_tombstone.ex
pagination.ex
PasswordResetToken.ex	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
registration.ex
repo.ex
reverse_proxy.ex
stats.ex
thread_mute.ex
upload.ex
user.ex	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-02 14:05:34 +03:00
user_invite_token.ex