Andrey
|
fef04d9ae1
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !266
|
8 years ago |
|
Andrey
|
11aa0e2b20
|
Merge branch 'dev' into 'sales_features'
# Conflicts:
# .gitignore
# lms/settings.py
|
8 years ago |
|
Andrey
|
031ab8914e
|
finance logging
|
8 years ago |
|
Andrey
|
c67385c21c
|
finance logging
|
8 years ago |
|
Andrey
|
866855ddd2
|
finance logging
|
8 years ago |
|
Andrey
|
6cf99a0a7e
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !265
|
8 years ago |
|
Andrey
|
610500446a
|
finance logging
|
8 years ago |
|
Andrey
|
fc76f58f17
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !264
|
8 years ago |
|
Andrey
|
b815f04472
|
finance logging
|
8 years ago |
|
Andrey
|
f027b109a5
|
finance logging
|
8 years ago |
|
Andrey
|
7bf6eca3c4
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !263
|
8 years ago |
|
Andrey
|
32e76a32a8
|
finance logging
|
8 years ago |
|
Andrey
|
cbb20966cc
|
Merge branch 'sales_features' into 'dev'
finance logging
See merge request !262
|
8 years ago |
|
Andrey
|
08b4a28e6e
|
finance logging
|
8 years ago |
|
Andrey
|
2239a94edf
|
Merge branch 'sales_features' into 'dev'
Sales features
See merge request !261
|
8 years ago |
|
Andrey
|
7506946cd4
|
finance logging
|
8 years ago |
|
Andrey
|
d7e89aff1d
|
finance logging
|
8 years ago |
|
Andrey
|
11c7f750d0
|
Merge branch 'current_branch' into 'dev'
finance logging
See merge request !257
|
8 years ago |
|
Andrey
|
a3a5011a06
|
finance logging
|
8 years ago |
|
Andrey
|
b79883cee4
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !255
|
8 years ago |
|
Andrey
|
8c4aec26fa
|
pay
|
8 years ago |
|
Andrey
|
29ec341c47
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !253
|
8 years ago |
|
Andrey
|
a0fc46bdb2
|
pay
|
8 years ago |
|
Andrey
|
53441959d8
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !251
|
8 years ago |
|
Andrey
|
63ccf9f085
|
pay
|
8 years ago |
|
Andrey
|
cd7dfed780
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !250
|
8 years ago |
|
Andrey
|
77bcaa95f6
|
pay
|
8 years ago |
|
Andrey
|
36e2c162b2
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !249
|
8 years ago |
|
Andrey
|
71fd94d61f
|
pay
|
8 years ago |
|
Andrey
|
8673fd6ad3
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !247
|
8 years ago |
|
Andrey
|
9293ae5697
|
pay
|
8 years ago |
|
Andrey
|
36fce7172c
|
pay
|
8 years ago |
|
Andrey
|
b6ada6ebbf
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !245
|
8 years ago |
|
Andrey
|
3c28c27bd5
|
pay
|
8 years ago |
|
Andrey
|
07e02ca1a2
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !244
|
8 years ago |
|
Andrey
|
9364171ac0
|
pay
|
8 years ago |
|
Andrey
|
641842e1b1
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !243
|
8 years ago |
|
Andrey
|
b4d4402c73
|
pay
|
8 years ago |
|
Andrey
|
2fb8c17f97
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !241
|
8 years ago |
|
Andrey
|
f1b91d347e
|
pay
|
8 years ago |
|
Andrey
|
05c825c469
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !239
|
8 years ago |
|
Andrey
|
a11d6c698f
|
pay
|
8 years ago |
|
Andrey
|
524c94f15c
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !237
|
8 years ago |
|
Andrey
|
19021a4eab
|
pay
|
8 years ago |
|
Andrey
|
02c4bf178b
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !235
|
8 years ago |
|
Andrey
|
53cb094345
|
pay
|
8 years ago |
|
Andrey
|
8db06d2096
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !233
|
8 years ago |
|
Andrey
|
8da2c4205d
|
pay
|
8 years ago |
|
Andrey
|
fc5cfcc77a
|
Merge branch 'current_branch' into 'dev'
pay
See merge request !231
|
8 years ago |
|
Andrey
|
fa7261821c
|
pay
|
8 years ago |
