Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py
This commit is contained in:
Adarnof
2017-04-07 00:26:59 -04:00
10 changed files with 47 additions and 73 deletions

View File

@@ -10,7 +10,7 @@
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Services" %}</h1>
<table class="table table-bordered">
<table class="table table-hover">
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Username" %}</th>