Bart Visscher 0120f3fd62 Merge branch 'routing' ...

Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php

2012-10-27 11:58:02 +02:00

..

ajax

Merge branch 'master' into routing

2012-10-17 16:38:11 +02:00

css

box-shadow can safely be used without vendor prefixes

2012-10-23 23:50:11 +02:00

img

Optimized image size

2012-08-18 13:56:04 +02:00

js

Merge branch 'routing'

2012-10-27 11:58:02 +02:00

l10n

[tx-robot] updated from transifex

2012-10-27 00:02:05 +02:00

templates

Revert "Remove old password check from changepassword and use verifyUser instead"

2012-10-15 23:49:49 +02:00

admin.php

Convert menu entries of settings pages to use router

2012-09-28 23:20:17 +02:00

apps.php

Convert menu entries of settings pages to use router

2012-09-28 23:20:17 +02:00

help.php

Convert menu entries of settings pages to use router

2012-09-28 23:20:17 +02:00

languageCodes.php

From now on we support two german translation: formal and personal

2012-10-16 23:40:14 +02:00

personal.php

Merge branch 'master' into routing

2012-10-17 16:38:11 +02:00

routes.php

Fix route name

2012-10-05 09:41:27 +02:00

settings.php

Merge branch 'master' into routing

2012-10-17 16:38:11 +02:00

trans.png

Optimized image size

2012-08-18 13:56:04 +02:00

users.php

Convert menu entries of settings pages to use router

2012-09-28 23:20:17 +02:00