Nweni 0cc378f318 fixed conflict

2017-06-06 09:43:16 +06:30

..

controllers

merge all 03062017

2017-06-03 12:50:08 +06:30

factories

menu and menu_category

2017-03-27 22:09:16 +06:30

helpers

merge all 03062017

2017-06-03 12:50:08 +06:30

jobs

add cable but not complete

2017-05-30 19:02:40 +06:30

models

fixed conflict

2017-06-06 09:43:16 +06:30

requests

merge all 03062017

2017-06-03 12:50:08 +06:30

routing

merge all 03062017

2017-06-03 12:50:08 +06:30

support

…

views

merge all 03062017

2017-06-03 12:50:08 +06:30

rails_helper.rb

…

spec_helper.rb

…