projects
/
conactparaph
/
conactparaph.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bf02ed
1f68623
)
Merge branch 'master' of https://scm.adullact.net/authscm/villedebordeaux/git/conactp...
master
author
Christophe Picot
<c.picot@mairie-bordeaux.fr>
Mon, 19 Jan 2015 15:47:55 +0000
(16:47 +0100)
committer
Christophe Picot
<c.picot@mairie-bordeaux.fr>
Mon, 19 Jan 2015 15:47:55 +0000
(16:47 +0100)
Conflicts:
iParapheurClient/pom.xml
1
2
.gitignore
patch
|
|
|
blob
diff --cc
.gitignore
index 0000000,0000000..
ad7c3df
new file mode 100644
(file)
--- /dev/null
--- /dev/null
+++ b/
.gitignore
@@@ -1,0 -1,0
+1,2
@@@
++/iParapheurClient/target
++/iParapheurClient/dependency-reduced-pom.xml