diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-17 12:53:15 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-17 12:53:15 +0100 |
| commit | 503a5e08e5726be3e22e7eb32e625125df2bc107 (patch) | |
| tree | ba14f7973a971c5976fec0d5b5f64a24e67c68bb /app/views/page/conference.html.haml | |
| parent | 65ad4f4f029c4c072fbc3a79a7677b1010cd5afd (diff) | |
| parent | 5d244ddcef6eeb2b33dfb8dcc5295b3b915498df (diff) | |
Merge branch 'doublecheck' into develop
Diffstat (limited to 'app/views/page/conference.html.haml')
0 files changed, 0 insertions, 0 deletions