mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity
pleroma/lib
History
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
..
mix/tasks Merge branch 'develop' into feature/compat/push-subscriptions 2018-12-06 20:15:16 +07:00
pleroma Merge branch 'develop' into feature/compat/push-subscriptions 2018-12-06 20:15:16 +07:00
jason_types.ex Format the code. 2018-03-30 15:01:53 +02:00
transports.ex Format the code. 2018-03-30 15:01:53 +02:00
xml_builder.ex Format the code. 2018-03-30 15:01:53 +02:00