Skip to content
Snippets Groups Projects
Commit 9b1e75ba authored by rinpatch's avatar rinpatch
Browse files

Merge branch 'my-develop' into 'develop' 

Docker specific configuration information

See merge request pleroma/pleroma!1359
parents a8c9522e 4c40ada7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment