Merge branch 'master' into develop
This commit is contained in:
@@ -70,7 +70,7 @@
|
||||
<small class="d-block d-md-none">
|
||||
<asp:Label ID="lblLastReadSm" runat="server" Text='<%# Eval("lastRead","{0:HH:mm:ss}") %>' /></small>
|
||||
<small class="d-none d-md-block">
|
||||
<asp:Label ID="lblLastRead" runat="server" Text='<%# Eval("lastRead","{0:yyHH:mm:ss}") %>' /></small>
|
||||
<asp:Label ID="lblLastRead" runat="server" Text='<%# Eval("lastRead","{0:yyyy.MM.dd HH:mm:ss}") %>' /></small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -80,7 +80,7 @@
|
||||
<small class="d-block d-md-none">
|
||||
<asp:Label ID="lbllastRequestSm" runat="server" Text='<%# Eval("lastRequest","{0:HH:mm:ss}") %>' /></small>
|
||||
<small class="d-none d-md-block">
|
||||
<asp:Label ID="lbllastRequest" runat="server" Text='<%# Eval("lastRequest","{0:yyHH:mm:ss}") %>' /></small>
|
||||
<asp:Label ID="lbllastRequest" runat="server" Text='<%# Eval("lastRequest","{0:yyyy.MM.dd HH:mm:ss}") %>' /></small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user