Merged 2.5.x into saas

This commit is contained in:
Duncan Sommerville 2014-11-05 17:36:58 -05:00
commit 4d263ce897
26 changed files with 2618 additions and 1649 deletions

View file

@ -153,7 +153,6 @@ $(document).ready(function() {
$.post(url, {format: "json", data: data}, function(json){
$('#content').empty().append(json.html);
$.cookie("default_airtime_locale", $('#locale').val(), {path: '/'});
setTimeout(removeSuccessMsg, 5000);
showErrorSections();
setMailServerInputReadonly();