mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2025-04-29 22:24:44 +00:00
Code Issues Projects Releases Wiki Activity
pleroma/lib
History
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
2018-12-06 19:55:58 +07:00
..
mix/tasks Merge branch 'develop' into feature/compat/push-subscriptions 2018-12-06 19:55:58 +07:00
pleroma Merge branch 'develop' into feature/compat/push-subscriptions 2018-12-06 19:55:58 +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