4.0.1 commit

This commit is contained in:
Trevor Squillario 2014-11-08 14:03:28 -05:00
parent ccca94e8ba
commit 0bdb803966
24 changed files with 425 additions and 347 deletions

View file

@ -1,6 +1,6 @@
JamStash.controller('SettingsCtrl',
function SettingsCtrl($rootScope, $scope, $routeParams, $location, utils, globals, json, notifications, player) {
$scope.settings = globals.settings;
$scope.settings = globals.settings; /* See service.js */
$scope.Timeouts = [
{ id: 10000, name: 10 },
{ id: 20000, name: 20 },