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-01 18:17:51 +12:00
2014-08-14 09:08:26 +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
2012-09-20 10:46:59 +02:00
2014-07-09 18:04:05 +12:00
2014-07-09 18:04:05 +12:00
2013-05-21 22:24:41 +12:00
2014-08-14 09:08:26 +12:00
2012-11-15 14:43:19 +13:00
2014-07-09 18:04:05 +12:00
2014-08-14 09:08:26 +12:00
2014-07-30 11:07:01 +12:00
2014-03-30 21:11:56 +13:00
2014-07-09 18:04:05 +12:00
2012-04-15 10:50:19 +12:00
2014-08-14 09:08:26 +12:00
2014-03-05 15:48:55 +13:00
2014-07-16 09:18:51 +01:00
2014-08-14 09:08:26 +12:00
2014-07-30 11:07:01 +12:00
2012-11-02 18:21:02 -07:00
2013-11-21 13:03:18 +00:00
2014-07-23 12:38:41 +12:00
2013-11-18 20:38:57 +13:00
2014-03-18 09:18:04 +13:00
2014-07-09 18:04:05 +12:00
2014-07-30 11:07:01 +12:00
2014-07-09 18:04:05 +12:00
2014-02-07 17:43:41 +13:00
2013-05-24 15:19:19 -07:00
2014-03-03 22:22:03 +00:00
2013-03-15 13:56:43 +13:00
2014-01-09 16:32:27 +13:00
2014-07-09 18:04:05 +12:00