j2blake c1e28101dd Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6		2013-12-09 17:00:36 -05:00
..
i18n	Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6	2013-12-09 17:00:36 -05:00
templates/freemarker	VIVO-523 Change the way the example language files are presented.	2013-11-14 17:05:04 -05:00