Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into ydu

This commit is contained in:
Harry Bomrah 2014-11-13 16:44:07 +08:00
commit 8d58bc3f45
1 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -21,3 +21,5 @@ app/views/frontend
/public/uploads/*
public/assets/*
public/import_status.yml
public/announcement_link_widget_en.json
public/announcement_link_widget_zh_tw.json