Maximilian Mader 06882254a0 Merge branch 'master' into attachments ...

Conflicts:
	template/javascriptInclude.tpl

2013-10-06 02:12:42 +02:00

..

acp

Fix log archive time of -1 and add an info box if protocol is disabled.

2013-09-08 22:40:09 +02:00

data

Merge branch 'master' into attachments

2013-10-06 02:12:42 +02:00

page

Add first pieces of attachment upload

2013-09-14 23:45:34 +02:00

system

Merge branch 'master' into attachments

2013-10-06 02:12:42 +02:00

util

Remove use of deprecated methods

2013-08-19 23:23:26 +02:00