]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15cc3ef e51c2f2)
Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta
authoryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 22:38:53 +0000 (23:38 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 22:38:53 +0000 (23:38 +0100)
Conflicts:
telemeta/templates/telemeta/resource_add.html


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