Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tor Hveem 2013-10-11 23:41:03 +02:00
commit d797f4a305
1 changed files with 0 additions and 10 deletions

View File

@ -408,16 +408,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.buffers = models.model.buffers;
$scope.activeBuffer = models.getActiveBuffer
$scope.incrementAge = function () {
models.model.age++;
models.model.cats.push('nouveau chat');
}
$scope.clickS = function () {
$scope.countS = testService.incrementCount();
};
$rootScope.commands = []
$rootScope.models = models;