7 Commits

Author	SHA1	Message	Date
Damian Mooyman	e091bb8474	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # tests/model/VersionedTest.yml	2016-01-25 15:57:37 +13:00
Damian Mooyman	75493e79ff	Update translations	2016-01-25 15:06:55 +13:00
Sam Minnee	3ee8f505b7	MINORE: Remove training whitespace. ... The main benefit of this is so that authors who make use of .editorconfig don't end up with whitespace changes in their PRs. Spaces vs. tabs has been left alone, although that could do with a tidy-up in SS4 after the switch to PSR-1/2. The command used was this: for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+ find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//' done	2016-01-07 10:15:54 +13:00
Damian Mooyman	f220adc3e0	Update translations	2015-08-24 16:52:39 +12:00
Damian Mooyman	bc8bc7d0c5	Update translations	2015-06-19 18:18:00 +12:00
Damian Mooyman	69a244e03f	Update translations	2015-05-14 13:45:03 +12:00
Damian Mooyman	a7bd6de2ec	Update translations	2015-03-09 17:11:10 +13:00