Aleksander Machniak 9796cd2063 Merge branch 'dev-rfc822-preview' ...

Conflicts:
	CHANGELOG
	program/steps/mail/show.inc

2016-05-02 18:01:18 +02:00

..

addressbook

Protect download urls against CSRF using unique request tokens (#1490642)

2016-03-06 14:31:07 +01:00

mail

Merge branch 'dev-rfc822-preview'

2016-05-02 18:01:18 +02:00

settings

CS fixes: Replace use of "bool ? true : false" with just "bool"

2016-04-02 13:02:55 +02:00

utils

Emoticons-related code refactoring

2015-08-29 07:52:57 +02:00