diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 20:07:25 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2012-12-18 20:07:25 +0100 |
| commit | 9c392982e2ba7eaeb237268e9299637a8f8b4c3a (patch) | |
| tree | 4459fe807c87ff7d6c2649d4cc168e171047ed85 /app/controllers/manufacturers_controller.rb | |
| parent | 6d4151d0e73f38e6c4a9a8b1b0077dfc3306902b (diff) | |
| parent | 725dee030e2a4a80a9f3f91f2cc18259a7a030f7 (diff) | |
Merge branch 'fix_asset_problem' into develop
Diffstat (limited to 'app/controllers/manufacturers_controller.rb')
0 files changed, 0 insertions, 0 deletions