Nweni 0cc378f318 fixed conflict

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

..

assets

fixed conflict

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

channels

origin pull master

2017-06-03 13:44:10 +06:30

controllers

fixed conflict

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

forms

move login_from from model folder to form folder

2017-06-04 16:28:29 +06:30

helpers

origin pull master

2017-06-03 13:44:10 +06:30

jobs

del puts line in oqs

2017-06-05 18:54:17 +06:30

mailers

init project commit

2017-03-24 19:58:23 +06:30

models

fixed conflict

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

pdf

pulled master at 4

2017-06-04 18:29:58 +06:30

reports

more controller for cashier/waiter view

2017-05-10 01:10:21 +06:30

views

fixed conflict

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