clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge develop into 20170321_-_frio-fbbrowser

Browse Source 
Conflicts:
	view/theme/frio/js/filebrowser.js
	view/theme/frio/js/theme.js
	view/theme/frio/templates/filebrowser.tpl
	view/theme/frio/templates/jot.tpl
This commit is contained in:
rabuzarus
2017-04-03 00:51:34 +02:00
parent 5e54fb3a5f 1ce5cc1b49
commit ee293f2ce2
557 changed files with 14085 additions and 34536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
view/theme/frio/js/filebrowser.js
View File

@@ -91,7 +91,7 @@ var FileBrowser = {
FileBrowser.postLoad();
$(".error a.close").on("click", function(e) {
$(".error .close").on("click", function(e) {
e.preventDefault();
$(".error").addClass("hidden");
});