Merge origin/master

This commit is contained in:
RainLoop Team 2014-04-01 22:09:50 +04:00
commit ab817e1396
31 changed files with 1620 additions and 421 deletions

View file

@ -84,7 +84,7 @@
White List
</div>
<div class="alert alert-block span6 alert-null-left-margin" style="width: 562px;">
List of users webmail is allowed to access.
List of domain users webmail is allowed to access.
Use a space as delimiter.
</div>
<textarea class="input-xxlarge" style="width: 600px" rows="8" data-bind="value: whiteList" tabindex="-1"></textarea>