Administrator / test_3

6 commits

test
3e842416

Yarik authored
2016-02-12 12:50:25 +0200
Browse Dir »
test
f59447a7

Yarik authored
2016-02-12 11:58:19 +0200
Browse Dir »
test
405c1458

Yarik authored
2016-02-12 11:47:45 +0200
Browse Dir »
09.02.16
f6ea8941

Administrator authored
2016-02-12 10:36:32 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
3272f030
```
Conflicts:
	frontend/views/accounts/employment.php
	frontend/web/css/style.css
```
Administrator authored
2016-02-12 10:36:10 +0200
Browse Dir »
test
989c83b0

Yarik authored
2016-02-12 10:21:21 +0200
Browse Dir »

4 commits

09.02.16
376a557b

Administrator authored
2016-02-11 17:17:32 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
ecd4fb4c

Administrator authored
2016-02-11 16:31:01 +0200
Browse Dir »
test
588209fc

Yarik authored
2016-02-11 16:24:45 +0200
Browse Dir »
09.02.16
4f404e20

Administrator authored
2016-02-11 12:26:11 +0200
Browse Dir »

9 commits

Merge remote-tracking branch 'origin/master' ...
b3e1a425
```
# Conflicts:
#	common/models/User.php
```
Yarik authored
2016-02-10 18:18:07 +0200
Browse Dir »
test
b95371cf

Yarik authored
2016-02-10 18:15:41 +0200
Browse Dir »
09.02.16
9bb0160d

Administrator authored
2016-02-10 17:36:23 +0200
Browse Dir »
09.02.16
658d13d4

Administrator authored
2016-02-10 16:54:28 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
b755b2cd

Administrator authored
2016-02-10 15:19:53 +0200
Browse Dir »
test
b16ed95f

Yarik authored
2016-02-10 15:18:56 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
484e9122

Administrator authored
2016-02-10 14:48:50 +0200
Browse Dir »
test
02524a34

Yarik authored
2016-02-10 12:37:16 +0200
Browse Dir »
09.02.16
033f9331

Administrator authored
2016-02-10 09:48:58 +0200
Browse Dir »

6 commits

test
ea09d15d

Yarik authored
2016-02-09 18:03:42 +0200
Browse Dir »
test
c1b01820

Yarik authored
2016-02-09 15:44:14 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
bca17da7

Yarik authored
2016-02-09 15:37:19 +0200
Browse Dir »
test
aa182b5c

Yarik authored
2016-02-09 15:16:31 +0200
Browse Dir »
09.02.16
30fbd0bc

Administrator authored
2016-02-09 15:14:43 +0200
Browse Dir »
test
84ebac3d

Yarik authored
2016-02-09 13:59:56 +0200
Browse Dir »

2 commits

test
7eb29439

Yarik authored
2016-02-08 18:06:27 +0200
Browse Dir »
add Vitaliy's widgets
998611ce

Administrator authored
2016-02-08 10:25:10 +0200
Browse Dir »

5 commits

test
766bd93b

Yarik authored
2016-02-05 18:03:08 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
8ac2f37e
```
# Conflicts:
#	backend/web/js/option.js
#	frontend/views/accounts/general.php
#	frontend/views/layouts/admin.php
```
Yarik authored
2016-02-05 16:28:10 +0200
Browse Dir »
test
fa67310a

Yarik authored
2016-02-05 16:24:38 +0200
Browse Dir »
test
5f49082a

Yarik authored
2016-02-05 16:20:03 +0200
Browse Dir »
add Vitaliy's widgets
f0f915df

Administrator authored
2016-02-05 16:19:21 +0200
Browse Dir »

8 commits

Merge remote-tracking branch 'origin/master'
04b7173a

Yarik authored
2016-02-04 16:30:05 +0200
Browse Dir »
test
f6a2a0d5

Yarik authored
2016-02-04 16:11:57 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
3c71c462

Administrator authored
2016-02-04 15:48:51 +0200
Browse Dir »
add Vitaliy's widgets
01a3e990

Administrator authored
2016-02-04 15:48:39 +0200
Browse Dir »
test
4f1adc01

Yarik authored
2016-02-04 15:06:11 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
df45665b

Yarik authored
2016-02-04 14:33:48 +0200
Browse Dir »
test
f819c230

Yarik authored
2016-02-04 14:26:47 +0200
Browse Dir »
add Vitaliy's widgets
ea8c5991

Administrator authored
2016-02-04 14:26:00 +0200
Browse Dir »