Conflict merge

This commit is contained in:
Madson Jr
2018-07-18 13:26:27 -03:00
parent 238a78aafc
commit 7aba9991f6
4 changed files with 8 additions and 8 deletions

View File

@ -685,7 +685,7 @@ services:
networks:
- frontend
- backend
### Solr ################################################
solr:
build: