Merge branch 'desktop' of github.com:RuudBurger/CouchPotatoServer

2015-02-15 12:04:30 +01:00
parent 5b1dd68675 cd55966575
commit 40cd1b4e08
11 changed files with 429 additions and 3 deletions
@@ -117,7 +117,7 @@ var AboutSettingTab = new Class({
 		var self = this;
 		var date = new Date(json.version.date * 1000);
 		self.version_text.set('text', json.version.hash + (json.version.date ? ' ('+date.toLocaleString()+')' : ''));
-		self.updater_type.set('text', json.version.type + ', ' + json.branch);
+		self.updater_type.set('text', (json.version.type != json.branch) ? (json.version.type + ', ' + json.branch) : json.branch);
 	}

 });