Pull from master

This commit is contained in:
San Wai Lwin
2018-04-05 11:49:42 +06:30
parent 9bf4047548
commit fc8b2d3b73
14 changed files with 222 additions and 54 deletions

View File

@@ -11,8 +11,8 @@
<link rel="icon" href="favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">-->
<%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %>