]> git.parisson.com Git - telecaster-server.git/commitdiff
projects / telecaster-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 310eff1 6b67789)
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telecaster-server
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 16:37:12 +0000 (18:37 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Jul 2013 16:37:12 +0000 (18:37 +0200)
Conflicts:
tcserver/conf/etc/network/if-up.d/telecaster-rsync


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.