3 Commits

Author	SHA1	Message	Date
kikito	8ca546a431	merges master and fixes conflicts	2015-08-17 02:40:11 +02:00
kikito	543f718891	Adds phone_number to the regular user registration / account views	2015-08-17 01:16:08 +02:00
kikito	de73eac2d0	Moves the registrations controller to users/registrations ... This is necessary because rails gets confused when it has a a “root” registration_controller and another non-root one. The non-root one uses the views from the root.	2015-08-17 01:16:07 +02:00