OldHawk c3149302a0 Merge commit '84ec1c80d283cbea8b186629e7b1de49d91cf9ba' ...

* commit '84ec1c80d283cbea8b186629e7b1de49d91cf9ba':
  fix(heroku): fix invalid app.json (#1901)
  feat(deps): dependencies upgrade (#1887)
  release(0.6.0): MEAN.JS 0.6.0 (#1863)
  feat(readme): Deploy to Heroku button (#1854)
  fix(users): Spacing Issues
  Abstracted OAuth routes to use req param to identify strategy & moved scope to actual strategy definition.
  Save profile images to Amazon S3 (#1857)
  fix(build): Require correct dependencies for prod build (#1855)
  fix(eslint): Make `space-before-function-paren` rule consistent with other rules (#1858)
  fix(gulpfile): show error on uglify (#1860)
  feat(core): Add manifest.json (#1851)

# Conflicts:
#	CHANGELOG.md
#	README.md
#	modules/core/client/views/header.client.view.html
#	modules/users/client/views/settings/change-profile-picture.client.view.html
#	modules/users/server/controllers/users/users.profile.server.controller.js
#	package.json

2017-10-13 15:43:39 +08:00

..

controllers

fix(core): server error info render error

2017-05-27 15:51:14 +08:00

routes

formatting reboot (space-2 and consistency)

2015-07-31 10:04:02 -04:00

views

Merge commit '84ec1c80d283cbea8b186629e7b1de49d91cf9ba'

2017-10-13 15:43:39 +08:00