Permalink
Browse files

Merge branch 'maint'

* maint:
  FeinCMS v1.5.6
  fix the app_reverse templatetag to work in the following situation

Conflicts:
	feincms/__init__.py
  • Loading branch information...
2 parents 708e849 + 97888b8 commit 504ea94101a32732878da8ba282e8b09d1f4cf84 @matthiask matthiask committed Jun 26, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit 504ea94

Please sign in to comment.