Yan 09f9a29cde merge with master

2017-06-12 10:01:36 +06:30

..

controllers

merge with master

2017-06-12 10:01:36 +06:30

factories

…

helpers

merge with master

2017-06-12 10:01:36 +06:30

jobs

add cable but not complete

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

models

payment_setting

2017-06-08 17:57:29 +06:30

requests

fixed conflict

2017-06-09 12:04:36 +06:30

routing

fixed conflict

2017-06-09 12:04:36 +06:30

support

…

views

fixed conflict

2017-06-09 12:04:36 +06:30

rails_helper.rb

…

spec_helper.rb

…