Damian Mooyman 230d017677 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/css/ie7.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/font/icon-reference.html # admin/font/silverstripe.eot # admin/font/silverstripe.svg # admin/font/silverstripe.ttf # admin/font/silverstripe.woff # admin/scss/_forms.scss # admin/scss/_style.scss		2016-02-12 15:41:45 +13:00
..
src	Merge remote-tracking branch 'origin/3'	2016-02-12 15:41:45 +13:00
cs.js	Update translations	2016-01-21 14:22:35 +13:00
de.js	Update translations	2016-01-21 14:22:35 +13:00
en.js	Update translations	2016-01-21 14:22:35 +13:00
eo.js	Update translations	2016-01-21 14:22:35 +13:00
es.js	Merge remote-tracking branch 'origin/3'	2016-02-12 15:41:45 +13:00
fa_IR.js	Update translations	2016-02-04 11:03:41 +13:00
fi.js	Update translations	2016-01-21 14:22:35 +13:00
fr.js	Update translations	2016-01-21 14:22:35 +13:00
id_ID.js	Update translations	2016-01-21 14:22:35 +13:00
id.js	Update translations	2016-01-21 14:22:35 +13:00
it.js	Update translations	2016-01-21 14:22:35 +13:00
ja.js	Update translations	2016-01-21 14:22:35 +13:00
lt.js	Update translations	2016-01-21 14:22:35 +13:00
mi.js	Update translations	2016-01-21 14:22:35 +13:00
nb.js	Update translations	2016-01-21 14:22:35 +13:00
nl.js	Update translations	2016-01-21 14:22:35 +13:00
pl.js	Update translations	2016-01-21 14:22:35 +13:00
ro.js	Update translations	2016-01-21 14:22:35 +13:00
ru.js	Update translations	2016-01-21 14:22:35 +13:00
sk.js	Update translations	2016-01-21 14:22:35 +13:00
sl.js	Update translations	2016-01-21 14:22:35 +13:00
sr_RS.js	Update translations	2016-01-21 14:22:35 +13:00
sr_RS@latin.js	Update translations	2016-01-21 14:22:35 +13:00
sr.js	Update translations	2016-01-21 14:22:35 +13:00
sr@latin.js	Update translations	2016-01-21 14:22:35 +13:00
sv.js	Update translations	2016-01-21 14:22:35 +13:00
zh.js	Update translations	2016-01-21 14:22:35 +13:00