Roman Chvanikov 01fe5abad1 Resolve conflicts		2019-06-07 01:20:50 +03:00
..
gettext	Phoenix skeleton	2017-03-17 17:09:58 +01:00
repo	Resolve conflicts	2019-06-07 01:20:50 +03:00
static	Merge branch 'mascot/pleroma-tan-shy' into 'develop'	2019-05-13 15:52:05 +00:00