honkoma/priv
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 Add Russian translation 2019-07-10 18:10:09 +07:00
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 merge develop 2019-07-12 18:08:27 +03:00