Merge pull request #118 from diging/develop

Prepare Release v3.1
diging · Aug 17, 2016 · 5abf911 · 5abf911
2 parents 857508b + 38a47c3
commit 5abf911
Show file tree

Hide file tree

Showing 30 changed files with 653 additions and 378 deletions.
diff --git a/Conceptpower+Spring/.gitignore b/Conceptpower+Spring/.gitignore
@@ -0,0 +1 @@
+/buildNumber.properties
diff --git a/Conceptpower+Spring/pom.xml b/Conceptpower+Spring/pom.xml
@@ -28,6 +28,7 @@
 		<spring-security-version>3.2.8.RELEASE</spring-security-version>
 		<lucene.index>/Users/karthikeyanmohan/Software/Conceptpower/indexFiles</lucene.index>
 		<pullrequest></pullrequest>
+		<debug_level>debug</debug_level>
 	</properties>
 
 	<repositories>