Administrator / test_3

5 commits

3 commits

1 commit

3 commits

2 commits

1 commit

2 commits

3 commits

2 commits

1 commit

10 commits

test
65326361

Yarik authored
2016-05-04 18:56:28 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
718ec4d1
```
# Conflicts:
#	frontend/web/css/style.css
```
Yarik authored
2016-05-04 18:55:11 +0300
Browse Dir »
git
6b42222c

Виталий authored
2016-05-04 17:41:34 +0300
Browse Dir »
git
ca179ba8

Виталий authored
2016-05-04 15:47:46 +0300
Browse Dir »
git
dacd45d0

Виталий authored
2016-05-04 15:30:15 +0300
Browse Dir »
git
ea788ff1

Виталий authored
2016-05-04 14:53:13 +0300
Browse Dir »
test
38ffb9db

Yarik authored
2016-05-04 14:45:23 +0300
Browse Dir »
git
dde061b3

Виталий authored
2016-05-04 14:30:45 +0300
Browse Dir »
git
2418215d

Виталий authored
2016-05-04 13:56:15 +0300
Browse Dir »
git
f9d0a7ef

Виталий authored
2016-05-04 13:46:21 +0300
Browse Dir »

7 commits

test
f0a961be

Yarik authored
2016-04-28 18:22:59 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
78e5a357
```
# Conflicts:
#	frontend/views/performer/portfolio-view.php
```
Yarik authored
2016-04-28 15:15:45 +0300
Browse Dir »
git
04bd4f61

Виталий authored
2016-04-28 14:05:51 +0300
Browse Dir »
28.04.16 перенес функционал по ужиманию картинок в UploaderComponent если с ними… ...
b772d73a
```
… буту траблы ищи причину в этом
```
Administrator authored
2016-04-28 11:39:35 +0300
Browse Dir »
Merge remote-tracking branch 'origin/master'
9157c35c

Administrator authored
2016-04-28 11:14:13 +0300
Browse Dir »
git
ebc2fc3e

Виталий authored
2016-04-28 10:17:04 +0300
Browse Dir »
28.04.16
2d76306a

Administrator authored
2016-04-28 10:09:16 +0300
Browse Dir »