diff options
| author | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
| commit | a4105f068e6f8ce89fbba475048f2a1e02e0fcbc (patch) | |
| tree | 91353015c71c5e2b73c416f1b6974423c1298632 /Rakefile | |
| parent | dc16c6f8e5382f9e5470eb2a40081d41f4112437 (diff) | |
| parent | 6347fdbe0d932e78dfa8259bf81355edb19508e9 (diff) | |
Merge branch 'master' into feature/tickets_controllers_simplification
Conflicts:
users/app/controllers/users_controller.rb
Diffstat (limited to 'Rakefile')
0 files changed, 0 insertions, 0 deletions