Merge remote-tracking branch 'origin/master' into safe_customize

2014-08-26 19:24:38 +04:00 · 2014-08-19 15:58:16 +04:00 · 2014-08-19 13:06:19 +04:00 · 2014-08-18 20:14:11 +04:00 · 2014-08-14 14:26:09 +04:00
21 changed files with 0 additions and 0 deletions
--- a/config_example.json
+++ b/config_example.json
--- a/website_example/admin.html
+++ b/website_example/admin.html
--- a/website_example/config.js
+++ b/website_example/config.js
--- a/website_example/custom.css
+++ b/website_example/custom.css
--- a/website_example/custom.js
+++ b/website_example/custom.js
--- a/website_example/index.html
+++ b/website_example/index.html
--- a/website_example/pages/admin/monitoring.html
+++ b/website_example/pages/admin/monitoring.html
--- a/website_example/pages/admin/statistics.html
+++ b/website_example/pages/admin/statistics.html
--- a/website_example/pages/admin/userslist.html
+++ b/website_example/pages/admin/userslist.html
--- a/website_example/pages/getting_started.html
+++ b/website_example/pages/getting_started.html
--- a/website_example/pages/home.html
+++ b/website_example/pages/home.html
--- a/website_example/pages/payments.html
+++ b/website_example/pages/payments.html
--- a/website_example/pages/pool_blocks.html
+++ b/website_example/pages/pool_blocks.html
--- a/website_example/pages/support.html
+++ b/website_example/pages/support.html
--- a/website_example/themes/deep-gray-dark-theme.css
+++ b/website_example/themes/deep-gray-dark-theme.css
--- a/website_example/themes/default-theme.css
+++ b/website_example/themes/default-theme.css
--- a/website_example/themes/ease-way-light-theme.css
+++ b/website_example/themes/ease-way-light-theme.css
--- a/website_example/themes/img/bg.jpg
+++ b/website_example/themes/img/bg.jpg
--- a/website_example/themes/img/bg2.jpg
+++ b/website_example/themes/img/bg2.jpg
--- a/website_example/themes/motherboard-dark-theme.css
+++ b/website_example/themes/motherboard-dark-theme.css
--- a/website_example/themes/nightly-mining-dark-theme.css
+++ b/website_example/themes/nightly-mining-dark-theme.css
Author	SHA1	Message	Date
fancoder	da0f153416	Merge remote-tracking branch 'origin/master' into safe_customize	2014-08-26 19:24:38 +04:00
fancoder	5d08f8ff12	Merge remote-tracking branch 'origin/master' into safe_customize	2014-08-19 15:58:16 +04:00
fancoder	262bbcce76	Merge remote-tracking branch 'origin/master' into safe_customize	2014-08-19 13:06:19 +04:00
fancoder	e7d59525fc	Merge remote-tracking branch 'origin/master' into safe_customize	2014-08-18 20:14:11 +04:00
fancoder	8c277e49c6	Rename config.json -> config_example.json & website -> website_example	2014-08-14 14:26:09 +04:00