diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-01-29 08:09:32 +0000 |
| commit | 39f74e92f0785eb3da2001d93682b8d1aadd35d5 (patch) | |
| tree | c31e10fa38b7375cd0dc1271fd53bbb36c3140bf /app/controllers/help_controller.rb | |
| parent | 4a15f9345f4e511d2743a62b6165a9604f6b1438 (diff) | |
| parent | cfe244c66c2744d3b7cfcf17cd87098334a9b737 (diff) | |
Merge branch 'hotfix/0.6.9.2' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/controllers/help_controller.rb')
0 files changed, 0 insertions, 0 deletions