Damian Mooyman 4f06a43986 Merge 3.3 into 3 ... # Conflicts: # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # javascript/lang/fr.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # lang/it.yml		2016-05-11 14:06:23 +12:00
..
api	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
assets	FIX extra_requirements to accept non associative arrays.	2013-06-02 13:37:34 +12:00
behat	BUG Fix error when modals are displayed	2016-04-22 10:31:49 +12:00
cache	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
control	Merge 3.3 into 3	2016-04-26 00:24:59 +01:00
core	Merge branch '3.3' into 3	2016-05-04 23:32:10 +01:00
dev	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
email	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
filesystem	test to prove #5222	2016-05-04 12:05:02 +12:00
forms	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
i18n	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
injector	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
integration	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
javascript	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
model	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
oembed	Add unit tests for oembed autodiscover and thumbnail detection	2016-04-15 14:00:10 +12:00
parsers	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
phpcs	Add code-sniffs other than line length to scrutinizer	2013-05-23 10:39:01 +12:00
search	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
security	Merge 3.3 into 3	2016-05-11 14:06:23 +12:00
tasks	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
templates	FIX: Parameters passed to includes overwrite all scopes (fixes #2617)	2016-05-04 16:49:12 +01:00
testing	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
view	FIX: Parameters passed to includes overwrite all scopes (fixes #2617)	2016-05-04 16:49:12 +01:00
Bare.yml	MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests.	2011-02-02 14:17:57 +13:00
bootstrap.php	Merge remote-tracking branch 'origin/3.1'	2014-11-18 12:45:54 +13:00
FakeController.php	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +12:00
MemoryLimitTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
phpcs_runner.php	Only have Scrutinizer check PHP files	2013-08-21 21:02:12 +12:00
PhpSyntaxTest.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00