moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

This commit is contained in:
lain 2018-04-26 07:07:04 +02:00
parent 3bad2b827a 845bd56c9c
commit 6eb274f278
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
View File

@ -1,4 +1,4 @@
<h2>Login in to Mastodon Frontend</h2> <h2>Login to Mastodon Frontend</h2>
<%= if @error do %> <%= if @error do %>
<h2><%= @error %></h2> <h2><%= @error %></h2>
<% end %> <% end %>