Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex		2019-10-23 17:22:42 +03:00
..
gettext
repo	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-23 17:22:42 +03:00
static	rework to use properties instead of compound typing, per SocialCG	2019-10-19 23:21:37 +00:00
templates