Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

This commit is contained in:
hudajkhan 2012-11-08 17:03:27 -05:00
commit 36fc649b7a

11
.gitignore vendored
View file

@ -1,3 +1,8 @@
/bin
.classpath
.project
/webapp/.build/
/.classpath
/.project
/.settings
/bin/
/webapp/config/deploy.properties
/webapp/config/debug.log4j.properties