pull origin master

This commit is contained in:
Yan
2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions

2
.gitignore vendored
View File

@@ -51,7 +51,7 @@ config/deploy/config/*
/dump.rdb
# Fonts
public/fonts/*
# public/fonts/*
# Ruby-Mine IDE folder
/.idea