Alexander Strizhakov bfeb33e951 Merge develop ... Merge conflict in lib/pleroma/activity.ex		2019-05-08 14:34:36 +00:00
..
admin	restart makes no sense here as we instructed to stop the service before	2019-04-01 16:26:46 +03:00
api	Merge develop	2019-05-08 14:34:36 +00:00
config	Add shortcode_globs setting to documentation	2019-04-22 11:17:53 +02:00
installation	Include explicit warning for emerge config line as it will vary more widely based on current version of postgres	2019-04-20 07:11:06 +00:00
clients.md	Move out of Gitlab Wiki	2019-03-28 19:46:30 +03:00
config.md	unused config paramater	2019-05-07 09:07:06 +07:00
introduction.md	change bold text to be proper geadings in introduction.md	2019-04-01 16:22:12 +03:00