diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 22:37:47 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-16 22:37:47 +0100 |
| commit | c2f63b8bf288903a68c562cdf9353e6840a7cb61 (patch) | |
| tree | 1b6d29aed4a452e77a6ff478ec7b0703de3c4a2d /app/models/softkey.rb | |
| parent | ee9efa4e414e89a5dbc8df5b94b758055d8ee633 (diff) | |
| parent | b8294f3ada89a6e26bf511455d80f2626a2fc09d (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models/softkey.rb')
0 files changed, 0 insertions, 0 deletions