Godwin 1efe20fe42 Fixed merge conflicts

2014-07-18 20:35:15 -06:00

..

_actions.html.haml

Fixed merge conflicts

2014-07-18 20:35:15 -06:00

_default.html.haml

Fixed merge conflicts

2014-07-18 20:35:15 -06:00

_errors_default.html.haml

User login error fixed

2014-05-17 18:20:13 -06:00

_field_image_field.html.haml

Moved form helpers from application_helper to a real FormHelper

2014-05-12 20:09:19 -06:00

_field_organization_select_field.html.haml

Moved form helpers from application_helper to a real FormHelper

2014-05-12 20:09:19 -06:00

_field_user_select_field.html.haml

Moved form helpers from application_helper to a real FormHelper

2014-05-12 20:09:19 -06:00

_label_default.html.haml

New look

2014-07-05 10:27:49 -06:00