Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/resources/logback.xml
This commit is contained in:
		| @@ -1,2 +1,2 @@ | ||||
| redis.host = localhost | ||||
| redis.host = redis-server | ||||
| redis.port = 6379 | ||||
		Reference in New Issue
	
	Block a user
	 Szakalakamaka
					Szakalakamaka