diff options
author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-26 17:24:17 +0200 |
---|---|---|
committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-26 17:24:17 +0200 |
commit | ee68d42c1a440432279d32838daebc26efbf33a3 (patch) | |
tree | af62c5a5c6e08331a426569f68c3cb389b5bda63 /config/config.js | |
parent | removed some passport classes that's going in config/passport.js (diff) | |
parent | Fixed bugs and showcase (diff) | |
download | Divid-ee68d42c1a440432279d32838daebc26efbf33a3.tar.gz |
Merge branch 'master' into dev
Conflicts:
app.js
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions