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
..
2014-08-14 09:08:26 +12:00
2014-02-04 08:19:04 +13:00
2013-11-29 17:49:30 +13:00
2014-01-31 15:15:59 +13:00
2014-07-09 18:04:05 +12:00
2014-02-04 08:19:04 +13:00
2014-01-31 15:15:59 +13:00
2014-07-09 18:04:05 +12:00
2014-07-09 18:04:05 +12:00
2014-07-09 18:04:05 +12:00
2014-01-31 15:15:59 +13:00
2014-02-04 08:19:04 +13:00
2013-11-29 17:49:30 +13:00
2013-11-29 17:49:30 +13:00
2013-11-29 17:49:30 +13:00
2014-05-06 10:22:09 +12:00
2014-06-12 16:47:49 +12:00
2014-03-16 09:36:48 +13:00
2013-11-29 17:49:30 +13:00
2013-11-29 17:49:30 +13:00
2014-07-09 18:04:05 +12:00