Merge branch 'master' of github.com:dpavlin/angular-mojolicious
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Nov 2010 22:28:55 +0000 (23:28 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 5 Nov 2010 22:28:55 +0000 (23:28 +0100)
commit28b421095dcb5d2f0e7ea38df2484d3326d448cc
tree78ff4c9a7dbe5cd12cc21cfbbdc2df6f34ec39ad
parentd5dbe7ae22f02e6f9ce631e7d0e222822545456d
parentf37c11c0c16145a7897b9676b5e73ebdc8483dce
Merge branch 'master' of github.com:dpavlin/angular-mojolicious
templates/conference/Work.html.ep