Merge branch 'development' into bootstrap

This commit is contained in:
Sebastian Grewe 2014-03-01 13:50:55 +01:00
commit 8bcce6c37d

View File

@ -94,9 +94,8 @@
<td align="center">{$NOTIFICATIONS[notification].time}</td>
<td align="center">
{if $NOTIFICATIONS[notification].type == new_block}New Block
{else if $NOTIFICATIONS[notification].type == auto_payout}Auto Payout
{else if $NOTIFICATIONS[notification].type == payout}Payout
{else if $NOTIFICATIONS[notification].type == idle_worker}IDLE Worker
{else if $NOTIFICATIONS[notification].type == manual_payout}Manual Payout
{else if $NOTIFICATIONS[notification].type == success_login}Successful Login
{/if}
</td>