Merge development with production

Rui Ferreira Rui Ferreira 2014-02-18

changed opensourceprojects/templates/jinja_master/nav_menu.html
changed opensourceprojects/controllers.py
opensourceprojects/templates/jinja_master/nav_menu.html Diff Switch to side-by-side view
Loading...
opensourceprojects/controllers.py Diff Switch to side-by-side view
Loading...