Dick Choi 2499a05473 Merge remote-tracking branch 'origin/master' into windows ...

Conflicts:
	browser/main/HomePage.js
	browser/main/HomePage/ArticleNavigator.js
	webpack.config.js

2015-12-15 13:06:01 +09:00

..

HomePage

fix typo shareWith -> shareVia

2015-12-13 22:46:59 +09:00

favicon.ico

update new icon and design

2015-07-20 03:19:17 +09:00

HomePage.js

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

2015-12-15 13:06:01 +09:00

index.html

bump up electron version 0.34 -> 0.35.1

2015-11-23 11:38:35 +09:00

index.js

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

2015-12-15 13:06:01 +09:00

LoginPage.js

article CRUD with socket

2015-10-16 22:12:49 +09:00

MainPage.js

Url share done

2015-12-13 14:22:45 +09:00

SignupPage.js

fix build env

2015-10-19 11:46:58 +09:00