]> git.parisson.com Git - teleforma.git/commit
Merge branch 'master' of /var/git/teleforma
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 17:44:42 +0000 (19:44 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 17:44:42 +0000 (19:44 +0200)
commitf4ea342ff058a82e95626cc9280dc37c4730a5df
tree89f92f5122b9a775648a1ae4b5032b7c4df8a77e
parent46ef32509615832b8471149bb53391ba0a5f7e0f
parentb2bd7de7589c1ea4d33a9f2dd88e5c312ce6f3a4
Merge branch 'master' of /var/git/teleforma
teleforma/templates/teleforma/course_conference.html