diff options
| author | spag <spag@golwen.net> | 2013-01-18 10:32:20 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-18 10:32:20 +0100 |
| commit | b05e8ae39b44a010c750e71b3f5dc8dbfd85398a (patch) | |
| tree | 3d7ec3d7db250d67e5f1e06ab4201ef62e73aed4 /app/views/page/conference.html.haml | |
| parent | b79543b0881a75c97a3710f4dadba6bf19ce6895 (diff) | |
| parent | bba745bb46b44d3897222e9d14e2c4f79ede4373 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/page/conference.html.haml')
0 files changed, 0 insertions, 0 deletions