hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b3e49d68cbb36f2a02ba48752cc45cfd2612c63f
Phraseanet/templates
History
Romain Neutron 727ad07908 Merge branch '3.8' 
Conflicts:
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/es_ES/LC_MESSAGES/phraseanet.mo
	locale/es_ES/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	templates/web/prod/actions/Property/index.html.twig
2014-02-24 16:29:32 +01:00
..
mobile
Address PR comments
2014-02-19 17:29:27 +01:00
web
Merge branch '3.8'
2014-02-24 16:29:32 +01:00