Merge remote-tracking branch 'roramirez_github/develop' into tests-vendors

This commit is contained in:
Rodrigo Ramírez Norambuena
2017-04-07 10:06:33 -03:00
44 changed files with 1021 additions and 94 deletions

2
vendor/vendor.js vendored
View File

@@ -9,7 +9,7 @@
var vendor = {
"moment.js" : "node_modules/moment/min/moment-with-locales.js",
"moment-timezone.js" : "node_modules/moment-timezone/moment-timezone.js",
"moment-timezone.js" : "node_modules/moment-timezone/builds/moment-timezone-with-data.js",
"weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
"weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
"font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css"