Administrator / test_3

6 commits

test
ea09d15d

Yarik authored
2016-02-09 18:03:42 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
bca17da7

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

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

Yarik authored
2016-02-09 15:16:31 +0200
Browse Dir »
tokar commit
fe41f4ed

Виталий authored
2016-02-09 15:06:35 +0200
Browse Dir »
test
84ebac3d

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

4 commits

Merge remote-tracking branch 'origin/master'
a952c014

Yarik authored
2016-02-08 18:06:48 +0200
Browse Dir »
test
7eb29439

Yarik authored
2016-02-08 18:06:27 +0200
Browse Dir »
tokar commit
3364fb6a

Виталий authored
2016-02-08 18:02:22 +0200
Browse Dir »
tokar commit
6a82a223

Виталий authored
2016-02-08 10:42:02 +0200
Browse Dir »

10 commits

Merge remote-tracking branch 'origin/master' ...
5860e30d
```
# Conflicts:
#	frontend/views/accounts/general.php
```
Yarik authored
2016-02-05 18:05:17 +0200
Browse Dir »
test
766bd93b

Yarik authored
2016-02-05 18:03:08 +0200
Browse Dir »
tokar commit
b9769b49

Виталий authored
2016-02-05 17:43:11 +0200
Browse Dir »
add Vitaliy's widgets
c8ee4f73

Administrator authored
2016-02-05 16:51:29 +0200
Browse Dir »
add Vitaliy's widgets
f729189c

Administrator authored
2016-02-05 16:31:51 +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
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 »
tokar commit
0dfdb6ef

Виталий authored
2016-02-05 16:06:34 +0200
Browse Dir »
tokar commit
d8e2d677

Виталий authored
2016-02-05 13:48:55 +0200
Browse Dir »

13 commits

add Vitaliy's widgets
9b69b051

Administrator authored
2016-02-04 17:33:29 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
0c90865d

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

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

Виталий authored
2016-02-04 15:52:45 +0200
Browse Dir »
tokar commit
157bff4e

Виталий authored
2016-02-04 15:52:21 +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 »
Merge remote-tracking branch 'origin/master'
cea1aeb3

Yarik authored
2016-02-04 11:06:06 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master' ...
7b83055d
```
Conflicts:
	frontend/views/accounts/general.php
```
Administrator authored
2016-02-04 10:21:51 +0200
Browse Dir »
add Vitaliy's widgets
bf9aa90f

Administrator authored
2016-02-04 10:21:02 +0200
Browse Dir »
first commit
a7142d16

Виталий authored
2016-02-04 10:17:36 +0200
Browse Dir »

7 commits

test
eacb83cc

Yarik authored
2016-02-03 16:48:04 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
d04fea85

Administrator authored
2016-02-03 15:40:40 +0200
Browse Dir »
add Vitaliy's widgets
ab6d9045

Administrator authored
2016-02-03 15:40:26 +0200
Browse Dir »
test
e9013fc3

Yarik authored
2016-02-03 15:39:41 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
84a35097

Yarik authored
2016-02-03 10:48:44 +0200
Browse Dir »
test
51e0a262

Yarik authored
2016-02-03 10:43:59 +0200
Browse Dir »
add Vitaliy's widgets
06d508f3

Administrator authored
2016-02-03 10:42:51 +0200
Browse Dir »