Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

Conflicts:
	modules/bindata/bindata.go
	public/js/gogs.js
This commit is contained in:
Richard Mahn
2016-07-22 14:07:36 -06:00
31 changed files with 132 additions and 52 deletions

View File

@@ -1458,5 +1458,6 @@ $(window).load(function () {
});
$(function() {
$('form').areYouSure();
if ($('.user.signin').length >0) return;
$('form').areYouSure();
});