Merge origin/master

This commit is contained in:
RainLoop Team 2014-04-01 22:09:50 +04:00
commit ab817e1396
31 changed files with 1620 additions and 421 deletions

View file

@ -141,7 +141,7 @@ module.exports = function (grunt) {
"vendors/routes/signals.min.js",
"vendors/routes/hasher.min.js",
"vendors/routes/crossroads.min.js",
"vendors/knockout/knockout-3.0.0.js",
"vendors/knockout/knockout-3.1.0.js",
"vendors/knockout-projections/knockout-projections-1.0.0.min.js",
"vendors/ssm/ssm.min.js",
"vendors/jua/jua.min.js",