strada valoda
...
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/logs/log-2013-05-23.php
veikala skats
..
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/logs/log-2013-05-23.php
	application/views/_main_layout.php
valodas salabotas
..
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/logs/log-2013-05-24.php
	application/logs/log-2013-05-25.php
savadītas preces veikalā (jāizdzēš liekās bildes, un jāsalabo, kāpēc divas lielās saglabājas)
jauno datu bāzi aizsūtīšu pa dienu
lielas izmaiņas ar dizainu... :)
uzlabot sitls
Izlaboti vairāki bugi(arī ielikti errori pie upload)
Izlaboti vairāki bugi(arī ielikti errori pie upload)
..
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/controllers/admin/article.php
Merge https://github.com/esenge/agnese

Conflicts:
	application/controllers/admin/article.php
	application/logs/log-2013-05-23.php
	application/views/_main_layout.php
	application/views/templates/page.php
	images/12060016.jpg
Merge branch 'origin' of https://github.com/esenge/agnese

Conflicts:
	application/controllers/admin/article.php
	application/logs/log-2013-05-27.php
	application/views/templates/page.php