phyusin 9f6505fd95 remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30

..

assets

remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30

channels

…

controllers

remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30

forms

…

helpers

split bill

2018-02-01 18:12:59 +06:30

inputs

…

jobs

update payment action cable

2018-01-25 15:33:52 +06:30

mailers

…

models

remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30

pdf

conflic data

2018-02-09 10:17:56 +06:30

reports

…

uploaders

…

views

remove conflict data in ability.rb

2018-02-09 14:06:16 +06:30