diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-07-04 11:12:21 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-07-04 11:12:21 +0100 |
| commit | 765d7fa16a428ec296d2278bc369d3680c7afaac (patch) | |
| tree | 16d3ede6a3eb74bc90b4b1fe16126ef6f4f8a74f /spec/controllers/general_controller_spec.rb | |
| parent | a9f1d84e7810936f7917c8a367b4713ea77554c9 (diff) | |
| parent | d95a5eb0b6aaba3a0d88ab0f2fe4c948c051ecc9 (diff) | |
Merge branch 'release/0.6.2'0.6.2
Conflicts:
doc/INSTALL.md
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions