Andrey
|
542ef29b95
|
Merge branch 'dev' into 'master'
Dev
See merge request !142
|
8 years ago |
|
Andrey
|
0936a2db8d
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !141
|
8 years ago |
|
Andrey
|
5b18561aa4
|
last_active
|
8 years ago |
|
Andrey
|
1470c34980
|
last_active
|
8 years ago |
|
Andrey
|
958f8e4a14
|
Merge branch 'dev' into 'master'
Dev
See merge request !140
|
8 years ago |
|
Andrey
|
a14a11bde7
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !139
|
8 years ago |
|
Andrey
|
fef2591e99
|
fix
|
8 years ago |
|
Andrey
|
1e917332dd
|
Merge branch 'dev' into 'master'
Dev
See merge request !138
|
8 years ago |
|
Andrey
|
243ea74bab
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !137
|
8 years ago |
|
Andrey
|
11fce2f2fb
|
fix
|
8 years ago |
|
Andrey
|
3ef091fced
|
Merge branch 'dev' into 'master'
Dev
See merge request !136
|
8 years ago |
|
Andrey
|
9b9523f760
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !135
|
8 years ago |
|
Andrey
|
2732f6cee6
|
fix
|
8 years ago |
|
Andrey
|
cdea05af83
|
Merge branch 'dev' into 'master'
Dev
See merge request !134
|
8 years ago |
|
Andrey
|
a42afda6b7
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !133
|
8 years ago |
|
Andrey
|
7134f46430
|
fix
|
8 years ago |
|
Andrey
|
738be9972d
|
Merge branch 'dev' into 'master'
Dev
See merge request !132
|
8 years ago |
|
Andrey
|
b0b2c6d8b2
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !131
|
8 years ago |
|
Andrey
|
03fb31ce0a
|
fix
|
8 years ago |
|
Andrey
|
9f50307d14
|
fix
|
8 years ago |
|
Andrey
|
d70a6122d6
|
Merge branch 'dev' into 'master'
fix
See merge request !130
|
8 years ago |
|
Andrey
|
496e053e0d
|
fix
|
8 years ago |
|
Andrey
|
1b67ee97bc
|
Merge branch 'dev' into 'master'
Dev
See merge request !129
|
8 years ago |
|
Andrey
|
ce187a2147
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !128
|
8 years ago |
|
Andrey
|
0c79de15f6
|
Merge branch 'dev' into 'current_branch'
# Conflicts:
# access/views.py
|
8 years ago |
|
Andrey
|
31b14cc293
|
fix
|
8 years ago |
|
Andrey
|
3b9e4d8d8b
|
Merge branch 'dev' into 'master'
Dev
See merge request !126
|
8 years ago |
|
Andrey
|
f7b0551d09
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !127
|
8 years ago |
|
Andrey
|
b98b46239a
|
fix
|
8 years ago |
|
Andrey
|
b13a716def
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !125
|
8 years ago |
|
Andrey
|
0a65021bb6
|
fix
|
8 years ago |
|
Andrey
|
4c4f65da46
|
fix
|
8 years ago |
|
Andrey
|
958e06a084
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !124
|
8 years ago |
|
Andrey
|
e9b157c387
|
fix
|
8 years ago |
|
Andrey
|
c5a0356352
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !123
|
8 years ago |
|
Andrey
|
8a0f50504a
|
fix
|
8 years ago |
|
Andrey
|
ee664523d3
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !122
|
8 years ago |
|
Andrey
|
1fcb8d2eb0
|
fix
|
8 years ago |
|
Andrey
|
b3838ce297
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !121
|
8 years ago |
|
Andrey
|
01dd3e9715
|
fix
|
8 years ago |
|
Andrey
|
b3e290a89a
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !120
|
8 years ago |
|
Andrey
|
e7f2936ded
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
61b2726004
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !119
|
8 years ago |
|
Andrey
|
68fdd77e07
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
ea39c1815d
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
a2e180b28c
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !118
|
8 years ago |
|
Andrey
|
7b28e891c0
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
326820d94f
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
dbda0b4bec
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !115
|
8 years ago |
|
Andrey
|
a808a9f9ba
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
