Merge branch 'master' into green

This commit is contained in:
Andrew Brown 2021-07-20 13:30:29 -07:00
commit 04b1327504

View File

@ -29,7 +29,7 @@
-->
</div>
<div class="card-content black-text js-content-name">
<% if timeline.universe_id? %>
<% if timeline.universe %>
<p class="right">
<%= link_to timeline.universe, class: "#{Universe.text_color}" do %>
<i class="material-icons left"><%= Universe.icon %></i>