Merge branch '2.x' of github.com:essentials/Essentials into 2.x

This commit is contained in:
KHobbits 2014-02-16 01:15:25 +00:00
commit a1a190bb02

View file

@ -48,12 +48,12 @@
<distributionManagement>
<snapshotRepository>
<id>esssnapshot</id>
<url>http://repo.ess3.net/content/repositories/esssnapshot</url>
<id>essdev</id>
<url>http://repo.ess3.net/content/repositories/essdev</url>
</snapshotRepository>
<repository>
<id>essrelease</id>
<url>http://repo.ess3.net/content/repositories/essrelease</url>
<id>essrel</id>
<url>http://repo.ess3.net/content/repositories/essrel</url>
</repository>
</distributionManagement>