Merge branch 'develop'

# Conflicts: # README.md
killheaven · Mar 13, 2018 · 945ba57 · 945ba57
2 parents 1f53d48 + 646cafb
commit 945ba57
Show file tree

Hide file tree

Showing 58 changed files with 9,136 additions and 1,228 deletions.
diff --git a/.htaccess b/.htaccess
@@ -7,8 +7,12 @@ RewriteRule ^top$ page627210.html
 RewriteRule ^about$ page627364.html
 RewriteRule ^privacy$ page627373.html
 
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^js/config.js$ config.php [L,QSA]
 
 RewriteRule ^widgets$ widgets.html
+
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^tx/(.*) index.php [L,QSA]

diff --git a/README.md b/README.md
@@ -16,12 +16,12 @@ Provides API, Widgets for websites.
 # Widgets for third-party websites
 ![alt tag](https://github.com/EverexIO/Ethplorer/blob/develop/images/augur-widget.png)
 
-[Samples and instructions for widget usage] (http://ethplorer.io/widgets)
+[Samples and instructions for widget usage](https://ethplorer.io/widgets)
 
 
 # API
 
-Documentation available at [WIKI pages ](https://github.com/EverexIO/Ethplorer/wiki/ethplorer-api).
+Documentation available at [WIKI pages](https://github.com/EverexIO/Ethplorer/wiki/ethplorer-api).
 
 
 # Installation