Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
..
2012-05-11 11:34:07 +12:00
2013-10-16 11:29:43 +13:00
2012-09-07 11:24:47 +12:00
2014-04-16 13:34:09 +01:00
2011-03-31 09:56:21 +13:00
2014-08-14 09:08:26 +12:00
2013-03-24 17:20:53 +01:00
2013-02-27 10:27:22 +01:00
2013-08-21 18:54:05 +12:00
2012-09-20 10:46:59 +02:00
2012-09-20 10:46:59 +02:00
2014-03-30 19:51:38 +13:00
2014-06-20 10:35:53 +12:00