trainerbill a98a84fd20 Fix merge conflicts

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

..

config

Fix merge conflicts

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

controllers

Update users.authentication.server.controller.js

2015-07-09 15:44:38 -04:00

models

updating the schema save pre hook so that it checks for a modified version of the password field before it tries to re-calculate the new password to save for the user model

2015-07-12 19:25:40 +03:00

routes

PayPal Authentication

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

templates

Add missing newline at the end of text files

2015-02-16 21:39:55 +01:00