Administrator / test_3

09 Feb, 2016

3 commits

09.02.16
30fbd0bc

Administrator authored
2016-02-09 15:14:43 +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 »

08 Feb, 2016

5 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 »
add Vitaliy's widgets
998611ce

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

05 Feb, 2016

14 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
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 »
Merge remote-tracking branch 'origin/master'
77092529

Administrator authored
2016-02-05 16:09:28 +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 »
Merge remote-tracking branch 'origin/master'
83f7b1ab

Administrator authored
2016-02-05 12:18:00 +0200
Browse Dir »
add Vitaliy's widgets
be426331

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

04 Feb, 2016

18 commits

Merge remote-tracking branch 'origin/master'
915f0cc5

Виталий authored
2016-02-04 17:40:26 +0200
Browse Dir »
tokar commit
0edbd4ef

Виталий authored
2016-02-04 17:39:53 +0200
Browse Dir »
add Vitaliy's widgets
9b69b051

Administrator authored
2016-02-04 17:33:29 +0200
Browse Dir »
tokar commit
114db4fb

Виталий authored
2016-02-04 16:43:38 +0200
Browse Dir »
tokar commit
9cfb6fa5

Виталий authored
2016-02-04 16:32:54 +0200
Browse Dir »
Merge remote-tracking branch 'origin/master'
04b7173a

Yarik authored
2016-02-04 16:30:05 +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 »
add Vitaliy's widgets
cb21ffec

Administrator authored
2016-02-04 16:02:00 +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 »