Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	pom.xml
This commit is contained in:
mung3r 2011-12-28 09:50:22 -08:00
parent b3bb0a40df 1237a11ef4
commit a41a70e587
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<project default="main" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<project default="main">
<property environment="env"/>

2
pom.xml
View File

@ -227,4 +227,4 @@ iConomy 4,5,6 BOSEconomy 6/7, EssentialsEcon, 3Co, MultiConomy, MineConomy, Econ
<url>http://repo.tehkode.ru/repository/repo/</url>
</repository>
</repositories>
</project>
</project>