Damian Mooyman cfc3b851e7 Merge remote-tracking branch 'origin/4.1' into 4.2 ... # Conflicts: # lang/sv.yml		2018-06-19 17:20:25 +12:00
..
conf	API Refactor bootstrap, request handling	2017-06-22 22:50:45 +12:00
Control	Session now prevents cache headers being sent unintentionally	2018-06-14 15:59:51 +12:00
Core	Merge remote-tracking branch 'origin/4.1' into 4	2018-06-13 11:25:20 +12:00
Dev	BUG Make regression in #7839 safer	2018-06-14 16:45:09 +12:00
Forms	Merge remote-tracking branch 'origin/4.1' into 4.2	2018-06-19 17:20:25 +12:00
i18n	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
includes	BUG Fix incorrect BASE_URL when webroot is parent of public folder	2018-02-07 14:28:06 +13:00
Logging	ENHANCEMENT Don't infer trace if explicitly provided	2017-11-16 11:03:01 +13:00
ORM	API Remove @internal from new 4.2 methods	2018-06-15 13:14:42 +12:00
Security	Merge branch '4.1' into 4	2018-05-30 15:08:39 +12:00
View	Merge remote-tracking branch 'origin/4.1' into 4	2018-06-11 10:19:04 +12:00