Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DATACOUCH-27

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Maciej Zasada
2013-10-09 23:12:24 +02:00
parent c62ad426e3 270f573ab3
commit 0fa284e534
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -5,6 +5,5 @@ target/
.project
.settings/*
# IntelliJ IDEA
*.iml
.idea
.idea/*