trainerbill a98a84fd20 Fix merge conflicts

2015-07-14 15:46:23 -05:00

..

change-password.client.view.html

fix btn-large class names.

2015-07-07 20:32:24 -04:00

change-profile-picture.client.view.html

New 0.4 version

2014-11-10 23:12:33 +02:00

edit-profile.client.view.html

fix btn-large class names.

2015-07-07 20:32:24 -04:00

manage-social-accounts.client.view.html

PayPal Authentication

2015-07-02 07:44:58 -05:00

settings.client.view.html

New 0.4 version

2014-11-10 23:12:33 +02:00