Aleksander Machniak b1d79900ed Fix invalid/partial merge of 3196d656db

2017-10-28 18:32:14 +02:00

..

include

Merge branch 'master' into dev-elastic

2017-10-28 18:24:54 +02:00

js

Use action=add-folder when creating a new folder

2017-10-27 09:50:33 +02:00

lib/Roundcube

Merge branch 'master' into dev-elastic

2017-10-28 18:24:54 +02:00

localization

Add localization label for "Personal"

2017-10-27 10:11:08 +02:00

resources

Remove external javascript code from the git repo, add jsdeps.sh script (#5535)

2016-12-03 18:26:15 +01:00

steps

Fix invalid/partial merge of 3196d656db

2017-10-28 18:32:14 +02:00