release elFinder version 2.1.18

Studio-42 · Nov 21, 2016 · 4f8b556 · 4f8b556
1 parent e429d6e
commit 4f8b556
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,13 @@
+2016-11-21  Naoki Sawada  <[email protected]>
+
+	* elFinder (2.1.18):
+
+		- [VD:FTP] Fixed #1757 cause infinite loop with getting stat of second level items from system root
+		- [js:core] Fixed #1761 problem of chunk merge request on 2.1.17 
+		- [php:core] Fixed #1762 broken backward compatibility of PHP < 5.4 on 2.1.17
+		- And some minor bug fixes
+
+
 2016-11-19  Naoki Sawada  <[email protected]>
 
 	* elFinder (2.1.17):

diff --git a/css/elfinder.full.css b/css/elfinder.full.css
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.17 (2.1-src Nightly: 8c5a7f6) (2016-11-21)
+ * Version 2.1.18 (2016-11-21)
  * http://elfinder.org
  * 
  * Copyright 2009-2016, Studio 42

diff --git a/css/elfinder.min.css b/css/elfinder.min.css
diff --git a/js/elfinder.full.js b/js/elfinder.full.js
@@ -1,6 +1,6 @@
 /*!
  * elFinder - file manager for web
- * Version 2.1.17 (2.1-src Nightly: 8c5a7f6) (2016-11-21)
+ * Version 2.1.18 (2016-11-21)
  * http://elfinder.org
  * 
  * Copyright 2009-2016, Studio 42
@@ -6544,7 +6544,7 @@ if (!Object.keys) {
  *
  * @type String
  **/
-elFinder.prototype.version = '2.1.17 (2.1-src Nightly: 8c5a7f6)';
+elFinder.prototype.version = '2.1.18';
 
 
 

diff --git a/js/elfinder.min.js b/js/elfinder.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "elfinder",
-	"version": "2.1.17",
+	"version": "2.1.18",
 	"description": "Open-source file manager for web, written in JavaScript using jQuery and jQuery UI.",
 	"author": "Studio-42 (https://github.com/Studio-42/elFinder)",
 	"license": "3-clauses BSD",