Damian Mooyman ca754eb887 Merge 3.3 into 3.4 ... # Conflicts: # admin/javascript/lang/fa_IR.js # admin/javascript/lang/it.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/it.js # lang/cs.yml # lang/eo.yml # lang/fa_IR.yml # lang/fi.yml # lang/it.yml # lang/sk.yml		2016-08-05 16:48:26 +12:00
..
jquery-ondemand	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
lang	Merge 3.3 into 3.4	2016-08-05 16:48:26 +12:00
tree	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
AssetUploadField.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ConfirmedPasswordField.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DateField.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridField.js	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
HtmlEditorField.js	Merge remote-tracking branch 'origin/3.3' into 3	2016-02-24 17:39:04 +13:00
i18n.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
i18nx.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
InlineFormAction.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
PermissionCheckboxSetField.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
SelectionGroup.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
TabSet.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ToggleCompositeField.js	BUG Fix accordion sometimes displaying scrollbars	2015-04-14 13:18:57 +12:00
ToggleField.js	BUG Fixing ToggleField to work correctly with jQuery	2012-11-16 11:33:58 +13:00
TreeDropdownField.js	Merge remote-tracking branch 'origin/3.3' into 3	2016-01-19 17:08:26 +13:00
UploadField_downloadtemplate.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
UploadField_select.js	FIX: Update references to ID values from 79c9433	2013-05-26 11:11:55 +12:00
UploadField_uploadtemplate.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
UploadField.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00