silverstripe-cms/code
Damian Mooyman c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
#	code/Controllers/ContentController.php
2018-04-05 08:37:48 +12:00
..
BatchActions FIX Remove legacy sprintf style translations in favour of placeholders 2017-08-02 13:42:52 +12:00
Controllers Merge remote-tracking branch 'origin/4.0' into 4.1 2018-04-05 08:37:48 +12:00
Forms BUG Restore missing '(Choose Page)' text in link insert modal 2017-11-16 14:43:32 +13:00
Model Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:34:14 +13:00
Reports Docblock 2017-11-02 11:29:49 +13:00
Search Merge branch '3.6' into 4.0 2018-03-18 09:17:20 +00:00
Tasks Update usages of ClassInfo 2017-09-20 15:20:17 +12:00