Tim Düsterhus 4abb837878 Merge branch 'master' into suspensionList ...

Conflicts:
	package.xml

2013-06-22 14:41:40 +02:00

..

acp

Don't delete expired suspensions

2013-06-22 14:40:54 +02:00

data

Merge branch 'master' into suspensionList

2013-06-22 14:41:40 +02:00

page

Implement command aliases

2013-06-17 23:48:59 +02:00

system

Merge branch 'master' into suspensionList

2013-06-22 14:41:40 +02:00

util

Move settings from user storage to user table

2013-05-24 17:30:27 +02:00