Merge branch 'master' of github.com:Gluejar/regluit

pull/1/head
Raymond Yee 2012-03-27 14:54:17 -07:00
commit efe105198f
2 changed files with 3 additions and 3 deletions

View File

@ -18,6 +18,7 @@
<div class="js-main">
<div id="js-leftcol">
{% include "faqmenu.html" %}
{% block subnav %}{% endblock %}
</div>
<div id="js-maincol-fr" class="have-right doc">
<div class="js-maincol-inner">

View File

@ -1,11 +1,10 @@
{% extends "notification/base.html" %}
{% load i18n %}
{% load bootstrap_tags %}
{% block head_title %}{% trans "Notification Settings" %}{% endblock %}
{% block title %}{% trans "Notification Settings" %}{% endblock %}
{% block body %}
{% block doccontent %}
<h2>{% trans "Settings" %}</h2>
<div class="notice_settings">