kikito 8ca546a431 merges master and fixes conflicts

2015-08-17 02:40:11 +02:00

..

edit.html.erb

Moves the registrations controller to users/registrations

2015-08-17 01:16:07 +02:00

new.html.erb

merges master and fixes conflicts

2015-08-17 02:40:11 +02:00