diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:49:02 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 10:49:02 +0100 |
| commit | b8699f361591f428a5260bf99b7ba4679e89a324 (patch) | |
| tree | 4cd853e9142e04e201a9d1a38460f3002f74478a /app/controllers/application_controller.rb | |
| parent | b6434d4b18e57e018bea6ab23916a0b134438b6a (diff) | |
| parent | e6f59296a3e89276a3c9511ec61023d0f54c27e3 (diff) | |
Merge branch 'hotfix/0.8.0.1' into rails-3-develop
Conflicts:
config/environment.rb
spec/mailers/track_mailer_spec.rb
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions