projects
/
ptlc-seda-ng
/
ptlc-seda-ng.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c87568a
f2a4f27
)
Merge remote-tracking branch 'origin/master'
author
iruiz
<ines.ruiz@adullact-projet.coop>
Fri, 24 Feb 2017 11:01:20 +0000
(12:01 +0100)
committer
iruiz
<ines.ruiz@adullact-projet.coop>
Fri, 24 Feb 2017 11:01:20 +0000
(12:01 +0100)
# Conflicts:
# connecteur/seda-ng/SedaNG.class.php
Trivial merge