73411a03b0
* KarlJakober-master: Add profile information and owned games to Steam template Steam API template display achievements Steam API code refactoring, added ownedGames API call removes steam auth, sets up steam api requests in async Adds Steam auth and API Conflicts: views/api/index.jade # # It looks like you may be committing a merge. # If this is not correct, please remove the file # .git/MERGE_HEAD # and try again. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # All conflicts fixed but you are still merging. # (use "git commit" to conclude merge) # # Changes to be committed: # # modified: README.md # modified: app.js # modified: config/passport.js # modified: config/secrets.js # modified: controllers/api.js # modified: models/User.js # new file: views/api/steam.jade # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: config/passport.js # modified: config/secrets.js # modified: models/User.js # modified: views/api/index.jade # |
||
|---|---|---|
| .. | ||
| passport.js | ||