diff options
| author | A.Avenel <avenel.alexandre@gmail.com> | 2012-11-03 17:34:05 +0100 |
|---|---|---|
| committer | A.Avenel <avenel.alexandre@gmail.com> | 2012-11-03 17:34:05 +0100 |
| commit | 2b51131aa4ce216a4a6235bf6d27652aee9eefd1 (patch) | |
| tree | c76f6d872cbda0f798a78fe6619a2078c1e2fac7 /budget/templates/layout.html | |
| parent | 0fcc2c72ec30b0ca10867f48a49c246f96387cc7 (diff) | |
| parent | cb13fbb782d3fda9f2ce20fcffddeb7cdf3a84a8 (diff) | |
| download | ihatemoney-mirror-2b51131aa4ce216a4a6235bf6d27652aee9eefd1.zip ihatemoney-mirror-2b51131aa4ce216a4a6235bf6d27652aee9eefd1.tar.gz ihatemoney-mirror-2b51131aa4ce216a4a6235bf6d27652aee9eefd1.tar.bz2 | |
Merge git://github.com/Lastpixl/ihatemoney into HEAD
Conflicts:
budget/templates/layout.html
budget/templates/list_bills.html
Diffstat (limited to 'budget/templates/layout.html')
| -rw-r--r-- | budget/templates/layout.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/budget/templates/layout.html b/budget/templates/layout.html index 8e6d3b2..27f5b5b 100644 --- a/budget/templates/layout.html +++ b/budget/templates/layout.html @@ -42,6 +42,7 @@ {% if g.project %} <ul class="nav primary-nav"> <li class="active"><a href="{{ url_for(".list_bills") }}">{{ _("Bills") }}</a></li> + <li><a href="{{ url_for(".settle_bill") }}">{{ _("Settle") }}</a></li> </ul> {% endif %} <ul class="nav pull-right secondary-nav"> |