Eike Foken 1d76db035d Merge branch 'master' of disposed.de:scattport ...

Conflicts:
	application/views/dashboard.php
	application/views/header.php

2011-08-11 05:12:31 +02:00

..

admin

Merge branch 'master' of disposed.de:scattport

2011-08-11 02:42:36 +02:00

auth

Fix missing /div

2011-08-08 15:57:45 +02:00

global

Add index.html to all folders

2011-08-08 00:13:32 +02:00

project

Implement gettext for project creation form

2011-08-11 03:28:37 +02:00

trial

Implement gettext for trials

2011-08-11 03:34:20 +02:00

user

Implement gettext for settings

2011-08-11 03:41:30 +02:00

dashboard.php

Merge branch 'master' of disposed.de:scattport

2011-08-11 05:12:31 +02:00

footer.php

Implement gettext for header, footer and dashboard

2011-08-11 03:10:08 +02:00

header.php

Merge branch 'master' of disposed.de:scattport

2011-08-11 05:12:31 +02:00

index.html

Add index.html to all folders

2011-08-08 00:13:32 +02:00