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-07-09 18:04:05 +12:00
2014-07-09 18:04:05 +12:00
2013-03-26 10:13:51 +01:00
2014-07-09 18:04:05 +12:00
2014-07-09 18:04:05 +12:00
2014-07-16 21:24:02 +10:00
2012-09-20 10:46:59 +02: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-07-09 18:04:05 +12:00
2013-07-12 15:07:43 +12:00
2014-08-07 21:01:23 +10:00
2013-03-24 17:20:53 +01: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
2012-09-20 10:46:59 +02:00
2014-07-09 18:04:05 +12:00
2013-03-24 17:20:53 +01:00
2014-07-09 18:04:05 +12:00
2014-08-14 09:08:26 +12: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