reports
resolved conflicts
1
Merge branch 'master' of https://github.com/xottabut/InternetProviderWind
reports
resolved conflict
Merge branch 'master' of https://github.com/xottabut/InternetProviderWind

Conflicts:
	InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/commands/CommandHelper.java
	InternetProvider/InternetProvider-web/src/main/java/com/netcracker/wind/mail/FormatedMail.java
1