Viewing all changes in revision 1402.
- Committer: Brennan Novak
- Date: 2014-02-06 17:42:22 UTC
- mfrom: (1358.1.1)
- Revision ID: git-v1:f2c52b5b5812c8ace1c44dcde148e24a549f4aaa
Fixing merge conflict from Pull request
- files modified:
- static/default/html/layouts/base.html
expand all
collapse all
added
removed
