projects
/
grace
/
grace.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e153a29
49aae42
)
Merge branch 'master' of https://scm.adullact.net/authscm/ebrehault/git/grace/grace
master
author
Eric BREHAULT
<ebrehault@gmail.com>
Mon, 10 Nov 2014 10:30:15 +0000
(11:30 +0100)
committer
Eric BREHAULT
<ebrehault@gmail.com>
Mon, 10 Nov 2014 10:30:15 +0000
(11:30 +0100)
Conflicts:
etc/sys/settings.cfg
Trivial merge