Merge branch 'master' of github.com:dpavlin/angular-mojolicious
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Nov 2010 10:39:11 +0000 (11:39 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Nov 2010 10:39:11 +0000 (11:39 +0100)
commitd5dbe7ae22f02e6f9ce631e7d0e222822545456d
treec82a79e61d7aa00169728fc540a4bb846b6acfbb
parent1c967c02e9f2bf97fc92996b404e2c461a2df179
parentac4d21c7fbbeb944f8ef2029ae09fd2ad352baad
Merge branch 'master' of github.com:dpavlin/angular-mojolicious
templates/conference/Work.html.ep