Damian Mooyman a3c52f901a Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Core/TempFolder.php # src/ORM/DataObject.php # src/View/ThemeResourceLoader.php # src/includes/constants.php # tests/php/Control/SimpleResourceURLGeneratorTest.php # tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php # tests/php/View/RequirementsTest.php		2018-01-22 14:57:05 +13:00
..
_images	Update main.php path to support framework in vendor	2017-10-03 09:03:37 +13:00
00_Getting_Started	Merge branch '3' into 4	2018-01-16 11:47:39 +00:00
01_Lessons	Removed deprecated tutorials from docs	2017-12-19 11:45:27 +13:00
02_Developer_Guides	Merge remote-tracking branch 'origin/4.0' into 4	2018-01-22 14:57:05 +13:00
03_Upgrading	remove tabs	2017-08-07 15:11:17 +12:00
04_Changelogs	Merge branch '4.0' into 4	2018-01-16 10:28:24 +00:00
05_Contributing	Docs: Remove forum and IRC references	2017-12-19 11:45:27 +13:00
index.md	Docs: Remove forum and IRC references	2017-12-19 11:45:27 +13:00