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
..
2013-05-25 19:07:06 +12:00
2014-08-14 09:08:26 +12:00
2012-01-08 19:14:32 +01:00
2012-01-08 19:14:32 +01:00
2013-05-20 09:59:53 +01:00
2013-08-24 12:14:11 +02:00
2013-06-15 11:24:22 +02:00
2012-04-04 14:27:50 +12:00
2013-10-22 16:44:28 +01:00
2011-10-28 17:34:15 +13:00
2012-01-08 19:14:32 +01:00
2013-04-08 19:54:46 +12:00
2012-01-08 19:14:32 +01:00
2013-08-29 16:21:04 +12:00
2012-01-08 19:14:32 +01:00
2014-07-25 16:15:49 +12:00