sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2025-01-05 11:35:17 +01:00
Code Issues Releases Wiki Activity
a11a7176d5
pleroma/lib
History
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
..
mix Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
pleroma Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-21 11:05:09 +03:00
jason_types.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
transports.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
xml_builder.ex Add license/copyright to all project files 2019-07-10 05:13:23 +00:00