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-02-19 16:57:27 +00:00
2014-08-05 15:02:18 +12:00
2012-12-12 17:33:31 +13:00
2012-12-19 17:00:39 +01:00
2013-05-10 20:32:59 +12:00
2013-04-16 09:54:30 +02:00
2014-07-17 14:14:52 +12:00
2014-08-14 09:08:26 +12:00
2014-06-05 22:47:49 +03:00
2014-06-05 22:47:49 +03:00
2012-02-16 23:07:24 +01:00
2014-01-15 15:51:35 +13:00
2012-12-11 11:06:06 +01:00
2014-07-17 14:14:52 +12:00
2014-07-17 14:14:52 +12:00
2012-11-16 11:33:58 +13:00
2014-07-31 15:38:47 +12:00
2014-01-04 22:30:35 +02:00
2013-05-26 11:11:55 +12:00
2013-05-27 15:22:59 +12:00
2014-08-14 09:08:26 +12:00