hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
280e8b61780b699261bf076d71e64d1ce3468f9f
Phraseanet/templates
History
Romain Neutron 280e8b6178 Merge branch '3.8' 
Conflicts:
	templates/web/client/baskets.html.twig
	templates/web/client/index.html.twig
	templates/web/prod/preview/basket_train.html.twig
	templates/web/prod/preview/feed_train.html.twig
	templates/web/prod/preview/reg_train.html.twig
2014-02-05 18:35:44 +01:00
..
mobile
Merge branch '3.8'
2014-02-03 19:02:22 +01:00
web
Merge branch '3.8'
2014-02-05 18:35:44 +01:00