Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2015-11-13 07:38:24 -06:00
326 changed files with 11948 additions and 4147 deletions
+1 -2
View File
@@ -1,8 +1,7 @@
'use strict';
require('coffee-script');
var _ = require('lodash');
var content = require('./content/index.coffee');
var content = require('./content/index');
var DROP_ANIMALS = _.keys(content.pets);