]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoAdded :fr: and :it: translations for Cloudron
Nicolas Lœuillet [Wed, 29 Mar 2017 10:31:52 +0000 (12:31 +0200)] 
Added :fr: and :it: translations for Cloudron

7 years agoAdd Cloudron as installation method
Johannes Zellner [Mon, 20 Mar 2017 14:11:50 +0000 (15:11 +0100)] 
Add Cloudron as installation method

7 years agoMerge pull request #2968 from chrido/master
Nicolas Lœuillet [Mon, 13 Mar 2017 09:56:33 +0000 (10:56 +0100)] 
Merge pull request #2968 from chrido/master

remove language on html tag

7 years agoMerge pull request #2971 from etiess/patch-3
Jérémy Benoist [Thu, 9 Mar 2017 14:34:40 +0000 (15:34 +0100)] 
Merge pull request #2971 from etiess/patch-3

Update paywall.rst (EN) with details + clear cache

7 years agoremove language on html-tag 2968/head
Christoph Doblander [Mon, 6 Mar 2017 20:34:50 +0000 (21:34 +0100)] 
remove language on html-tag

7 years agoMerge pull request #2954 from wallabag/update-version
Nicolas Lœuillet [Thu, 2 Mar 2017 13:43:04 +0000 (14:43 +0100)] 
Merge pull request #2954 from wallabag/update-version

Changed wallabag version

7 years agoChanged wallabag version 2954/head
Nicolas Lœuillet [Thu, 2 Mar 2017 13:42:16 +0000 (14:42 +0100)] 
Changed wallabag version

7 years agoMerge pull request #2916 from wallabag/update-changelog
Nicolas Lœuillet [Thu, 2 Mar 2017 13:40:22 +0000 (14:40 +0100)] 
Merge pull request #2916 from wallabag/update-changelog

Updated CHANGELOG with latest changes

7 years agoUpdated CHANGELOG with latest changes 2916/head
Nicolas Lœuillet [Mon, 20 Feb 2017 10:20:00 +0000 (11:20 +0100)] 
Updated CHANGELOG with latest changes

7 years agoMerge pull request #2950 from wallabag/fix-symlinks
Nicolas Lœuillet [Thu, 2 Mar 2017 13:16:51 +0000 (14:16 +0100)] 
Merge pull request #2950 from wallabag/fix-symlinks

Fixed symlinks issue during release creation

7 years agoFixed symlinks issue during release creation 2950/head
Nicolas Lœuillet [Wed, 1 Mar 2017 13:17:07 +0000 (14:17 +0100)] 
Fixed symlinks issue during release creation

7 years agoMerge pull request #2926 from qtheuret/master
Nicolas Lœuillet [Wed, 1 Mar 2017 12:32:46 +0000 (13:32 +0100)] 
Merge pull request #2926 from qtheuret/master

Add activation of 'rewrite' mod of Apache

7 years agoAdded german and italian translation 2926/head
Nicolas Lœuillet [Tue, 28 Feb 2017 20:10:24 +0000 (21:10 +0100)] 
Added german and italian translation

7 years agoMerge pull request #2932 from wallabag/mruminski-patch-1
Nicolas Lœuillet [Sat, 25 Feb 2017 07:28:31 +0000 (08:28 +0100)] 
Merge pull request #2932 from wallabag/mruminski-patch-1

Update Polish translation

7 years agoUpdate Polish translation 2932/head
Mateusz Rumiński [Fri, 24 Feb 2017 17:31:35 +0000 (18:31 +0100)] 
Update Polish translation

add missing translation

7 years agoMerge pull request #2931 from wallabag/php-7.1
Jeremy Benoist [Fri, 24 Feb 2017 15:23:06 +0000 (16:23 +0100)] 
Merge pull request #2931 from wallabag/php-7.1

Use wallabag/tcpdf

7 years agoUse wallabag/tcpdf 2931/head
Jeremy Benoist [Fri, 24 Feb 2017 14:05:43 +0000 (15:05 +0100)] 
Use wallabag/tcpdf

It should restore the PHP 7.1 compatibility

7 years agoActivate 'rewrite' mod of Apache
Quentin THEURET [Thu, 23 Feb 2017 15:10:14 +0000 (16:10 +0100)] 
Activate 'rewrite' mod of Apache

7 years agoAjout du mod 'rewrite' de Apache
Quentin THEURET [Thu, 23 Feb 2017 15:09:06 +0000 (16:09 +0100)] 
Ajout du mod 'rewrite' de Apache

7 years agoUpdate paywall.rst (EN) with details + clear cache 2971/head
etiess [Thu, 23 Feb 2017 07:54:33 +0000 (08:54 +0100)] 
Update paywall.rst (EN) with details + clear cache

7 years agoMerge pull request #2917 from ngosang/feature/es_translation_2
Jeremy Benoist [Mon, 20 Feb 2017 12:55:24 +0000 (13:55 +0100)] 
Merge pull request #2917 from ngosang/feature/es_translation_2

Update Spanish translation

7 years agoUpdate Spanish translation 2917/head
ngosang [Mon, 20 Feb 2017 11:21:02 +0000 (12:21 +0100)] 
Update Spanish translation

7 years agoMerge pull request #2915 from wallabag/import-drop-msg-user-null
Nicolas Lœuillet [Mon, 20 Feb 2017 08:45:12 +0000 (09:45 +0100)] 
Merge pull request #2915 from wallabag/import-drop-msg-user-null

Import: we now skip messages when user is null

7 years agoImport: we now skip messages when user is null 2915/head
Nicolas Lœuillet [Mon, 20 Feb 2017 08:16:02 +0000 (09:16 +0100)] 
Import: we now skip messages when user is null

7 years agoMerge pull request #2905 from nicofrand/patch-1
Nicolas Lœuillet [Mon, 20 Feb 2017 07:27:26 +0000 (08:27 +0100)] 
Merge pull request #2905 from nicofrand/patch-1

Alert that 2FA must be authorized in app/config/parameters.yml

7 years agoMerge pull request #2913 from wallabag/add-wllbgit-readme
Nicolas Lœuillet [Mon, 20 Feb 2017 07:05:58 +0000 (08:05 +0100)] 
Merge pull request #2913 from wallabag/add-wllbgit-readme

Added wallabag.it link in README

7 years agoAlert that 2FA must be authorized in app/config/parameters.yml 2905/head
Nicolas Frandeboeuf [Fri, 17 Feb 2017 09:57:18 +0000 (10:57 +0100)] 
Alert that 2FA must be authorized in app/config/parameters.yml

7 years agoMerge pull request #2832 from Kdecherf/search-domain
Jeremy Benoist [Sun, 19 Feb 2017 20:52:35 +0000 (21:52 +0100)] 
Merge pull request #2832 from Kdecherf/search-domain

Search by term: extend to entries url

7 years agoAdded wallabag.it link in README 2913/head
Nicolas Lœuillet [Sat, 18 Feb 2017 14:04:57 +0000 (15:04 +0100)] 
Added wallabag.it link in README

7 years agoMerge pull request #2911 from wallabag/jlnostr-patch-1
Nicolas Lœuillet [Fri, 17 Feb 2017 21:16:48 +0000 (22:16 +0100)] 
Merge pull request #2911 from wallabag/jlnostr-patch-1

Remove word repetition from german translation

7 years agoRemove word repetition from german translation 2911/head
Julian Oster [Fri, 17 Feb 2017 20:52:16 +0000 (21:52 +0100)] 
Remove word repetition from german translation

see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434

7 years agoMerge pull request #2908 from wallabag/move-it-documentatin
Nicolas Lœuillet [Fri, 17 Feb 2017 12:54:48 +0000 (13:54 +0100)] 
Merge pull request #2908 from wallabag/move-it-documentatin

Moved :it: documentation into it folder

7 years agoMoved :it: documentation into it folder 2908/head
Nicolas Lœuillet [Fri, 17 Feb 2017 12:12:09 +0000 (13:12 +0100)] 
Moved :it: documentation into it folder

7 years agoMerge pull request #2830 from Kdecherf/striptags-title
Nicolas Lœuillet [Fri, 17 Feb 2017 08:28:56 +0000 (09:28 +0100)] 
Merge pull request #2830 from Kdecherf/striptags-title

Fix rendering of entry title in Twig views

7 years agoMerge pull request #2882 from wallabag/add-translations-doc-mobile-apps
Nicolas Lœuillet [Fri, 17 Feb 2017 08:28:21 +0000 (09:28 +0100)] 
Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps

Doc: translated mobile apps configuration in french

7 years agoSearch by term: extend to entries url 2832/head
Kevin Decherf [Thu, 2 Feb 2017 20:39:28 +0000 (21:39 +0100)] 
Search by term: extend to entries url

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoSome changes to :de: translation 2882/head
Julian Oster [Thu, 16 Feb 2017 20:41:19 +0000 (21:41 +0100)] 
Some changes to :de: translation

7 years agoviews: cosmetic in share links href 2830/head
Kevin Decherf [Thu, 16 Feb 2017 20:36:34 +0000 (21:36 +0100)] 
views: cosmetic in share links href

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #2892 from ngosang/feature/es_translation
Jeremy Benoist [Thu, 16 Feb 2017 08:12:40 +0000 (09:12 +0100)] 
Merge pull request #2892 from ngosang/feature/es_translation

Update Spanish translation

7 years agoadd :de: doc user/configuring_mobile
Sven Fischer [Wed, 15 Feb 2017 16:11:43 +0000 (17:11 +0100)] 
add :de: doc user/configuring_mobile

7 years agoUpdate Spanish translation 2892/head
ngosang [Wed, 15 Feb 2017 14:41:06 +0000 (15:41 +0100)] 
Update Spanish translation

7 years agoMerge pull request #2875 from kgaut/patch-3
Nicolas Lœuillet [Tue, 14 Feb 2017 21:14:51 +0000 (22:14 +0100)] 
Merge pull request #2875 from kgaut/patch-3

Doc - information about Apache 2.4

7 years agoMerge pull request #2785 from matteocoder/patch-2
Nicolas Lœuillet [Tue, 14 Feb 2017 21:05:53 +0000 (22:05 +0100)] 
Merge pull request #2785 from matteocoder/patch-2

first_article.rst already inside articles.rst

7 years agoMerge pull request #2784 from matteocoder/patch-1
Nicolas Lœuillet [Tue, 14 Feb 2017 20:37:27 +0000 (21:37 +0100)] 
Merge pull request #2784 from matteocoder/patch-1

Doc: share.rst already integrated inside articles.rst

7 years agofirst_article.rst already inside articles.rst 2785/head
matteocoder [Wed, 25 Jan 2017 12:56:31 +0000 (07:56 -0500)] 
first_article.rst already inside articles.rst

The file is a duplicate of a section already present in articles.rst

7 years agoshare.rst already integrated inside articles.rst 2784/head
matteocoder [Wed, 25 Jan 2017 12:53:01 +0000 (07:53 -0500)] 
share.rst already integrated inside articles.rst

The share.rst file is just a duplicate of a section already present in another file.

7 years agoDoc: translated mobile apps configuration in french
Nicolas Lœuillet [Tue, 14 Feb 2017 19:45:08 +0000 (20:45 +0100)] 
Doc: translated mobile apps configuration in french

7 years agoMerge pull request #2878 from matteocoder/wallabag-docs-ita
Nicolas Lœuillet [Tue, 14 Feb 2017 17:33:43 +0000 (18:33 +0100)] 
Merge pull request #2878 from matteocoder/wallabag-docs-ita

Italian documentation added

7 years agoMerge pull request #2879 from matteocoder/matteocoder-patch-1
Nicolas Lœuillet [Tue, 14 Feb 2017 16:16:14 +0000 (17:16 +0100)] 
Merge pull request #2879 from matteocoder/matteocoder-patch-1

Fixed typo in "first_steps"

7 years agoItalian documentation added 2878/head
matteocoder [Tue, 14 Feb 2017 15:36:40 +0000 (16:36 +0100)] 
Italian documentation added

There are some missing links in various articles. Please let me know how I can fix this :)

7 years agoMerge pull request #2860 from wallabag/docs-update-3rd-party-apps
Nicolas Lœuillet [Tue, 14 Feb 2017 14:40:29 +0000 (15:40 +0100)] 
Merge pull request #2860 from wallabag/docs-update-3rd-party-apps

docs 3rd party tools: update java wrapper, add cmd tool to add article

7 years agodocs: add 3rd party app wallabako for Kobo readers 2860/head
Sven Fischer [Sat, 11 Feb 2017 08:11:55 +0000 (09:11 +0100)] 
docs: add 3rd party app wallabako for Kobo readers

7 years agoDoc - informations about Apache 2.4 2875/head
Kevin Gautreau [Tue, 14 Feb 2017 14:29:33 +0000 (15:29 +0100)] 
Doc - informations about Apache 2.4

7 years agoMerge pull request #2874 from kgaut/patch-2
Nicolas Lœuillet [Tue, 14 Feb 2017 14:11:08 +0000 (15:11 +0100)] 
Merge pull request #2874 from kgaut/patch-2

Add informations about Apache 2.4

7 years agoAdd informations about Apache 2.4 2874/head
Kevin Gautreau [Tue, 14 Feb 2017 08:24:56 +0000 (09:24 +0100)] 
Add informations about Apache 2.4

7 years agoMerge pull request #2869 from wallabag/log-restricted-access
Thomas Citharel [Mon, 13 Feb 2017 13:55:55 +0000 (14:55 +0100)] 
Merge pull request #2869 from wallabag/log-restricted-access

Log restricted access value

7 years agoLog restricted access value 2869/head
Jeremy Benoist [Mon, 13 Feb 2017 13:19:53 +0000 (14:19 +0100)] 
Log restricted access value

It might help to figure out if we have enabled it or not

7 years agodocs 3rd party tools: update java wrapper, add cmd tool to add article
Sven Fischer [Fri, 10 Feb 2017 23:43:04 +0000 (00:43 +0100)] 
docs 3rd party tools: update java wrapper, add cmd tool to add article

7 years agoMerge pull request #2846 from wallabag/mruminski-patch-1
Jeremy Benoist [Mon, 6 Feb 2017 16:29:31 +0000 (17:29 +0100)] 
Merge pull request #2846 from wallabag/mruminski-patch-1

fix misspells in polish translation

7 years agofix misspells in polish translation 2846/head
Mateusz Rumiński [Mon, 6 Feb 2017 14:38:33 +0000 (15:38 +0100)] 
fix misspells in polish translation

7 years agoMerge pull request #2842 from K-Phoen/update-rulerz
Jeremy Benoist [Mon, 6 Feb 2017 08:20:28 +0000 (09:20 +0100)] 
Merge pull request #2842 from K-Phoen/update-rulerz

Update RulerZ

7 years agoMerge pull request #2841 from Kdecherf/active-menu-search
Jeremy Benoist [Sun, 5 Feb 2017 20:08:39 +0000 (21:08 +0100)] 
Merge pull request #2841 from Kdecherf/active-menu-search

Show active list in the left menu during search

7 years agoUpdate RulerZ 2842/head
Kévin Gomez [Sun, 5 Feb 2017 17:02:09 +0000 (18:02 +0100)] 
Update RulerZ

7 years agoShow active list in the left menu during search 2841/head
Kevin Decherf [Sat, 4 Feb 2017 21:48:34 +0000 (22:48 +0100)] 
Show active list in the left menu during search

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #2788 from Zettt/master
Jeremy Benoist [Sun, 5 Feb 2017 11:49:43 +0000 (12:49 +0100)] 
Merge pull request #2788 from Zettt/master

Documentation on how to configure mobile apps to work with wallabag.it

7 years agoAdded configuration documentation for mobile apps 2788/head
Andreas Zeitler [Fri, 27 Jan 2017 07:13:19 +0000 (08:13 +0100)] 
Added configuration documentation for mobile apps

7 years agoMerge pull request #2839 from foxmask/master
Jeremy Benoist [Sun, 5 Feb 2017 11:34:20 +0000 (12:34 +0100)] 
Merge pull request #2839 from foxmask/master

scripts/update.sh: 18: scripts/update.sh: composer.phar: not found

7 years agoMerge pull request #2838 from wallabag/Quent-in-patch-1
Jeremy Benoist [Sat, 4 Feb 2017 20:54:43 +0000 (21:54 +0100)] 
Merge pull request #2838 from wallabag/Quent-in-patch-1

Update Oc version

7 years agoMerge pull request #2840 from wallabag/fix-frameworkbundle
Jeremy Benoist [Sat, 4 Feb 2017 20:53:26 +0000 (21:53 +0100)] 
Merge pull request #2840 from wallabag/fix-frameworkbundle

Restored correct version for framework-extra-bundle

7 years agoRestored correct version for framework-extra-bundle 2840/head
Nicolas Lœuillet [Sat, 4 Feb 2017 17:26:16 +0000 (18:26 +0100)] 
Restored correct version for framework-extra-bundle

The bundle was fixed in latest version.

7 years agoscripts/update.sh: 18: scripts/update.sh: composer.phar: not found 2839/head
FoxMaSk [Sat, 4 Feb 2017 16:02:25 +0000 (17:02 +0100)] 
scripts/update.sh: 18: scripts/update.sh: composer.phar: not found

when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.

7 years agoUpdate Oc version 2838/head
Quent-in [Sat, 4 Feb 2017 14:21:13 +0000 (15:21 +0100)] 
Update Oc version

I'll be ready for next train

7 years agoMerge pull request #2818 from Kdecherf/fix-search-bar
Nicolas Lœuillet [Fri, 3 Feb 2017 08:04:33 +0000 (09:04 +0100)] 
Merge pull request #2818 from Kdecherf/fix-search-bar

Fix nav-panel-search height

7 years agoFix rendering of entry title in Twig views
Kevin Decherf [Wed, 1 Feb 2017 22:39:34 +0000 (23:39 +0100)] 
Fix rendering of entry title in Twig views

This commit provides some improvements on the rendering of entry title
on entries list and entry views and refactors filter calls:
- Remove escape filter from apparent title, striptags is enough
- Move raw filter to the end of apparent title as it's ignored if not
  placed as the last filter
- Replace raw filter with e('html_attr') for title used in attributes,
  fixing possible issue and/or glitch
- Add striptags to entry.title used for link sharing to respect the
  apparent title

Fixes #2802

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoAdded minified CSS files 2818/head
Nicolas Lœuillet [Thu, 2 Feb 2017 13:19:47 +0000 (14:19 +0100)] 
Added minified CSS files

7 years agoFix nav-panel-search height
Kevin Decherf [Tue, 31 Jan 2017 21:17:40 +0000 (22:17 +0100)] 
Fix nav-panel-search height

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #2831 from wallabag/Quent-in-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 16:11:40 +0000 (17:11 +0100)] 
Merge pull request #2831 from wallabag/Quent-in-patch-1

Update of CraueConfigBundle in Occitan

7 years agoUpdate of CraueConfigBundle in Occitan 2831/head
Quent-in [Thu, 2 Feb 2017 15:29:28 +0000 (16:29 +0100)] 
Update of CraueConfigBundle in Occitan

7 years agoMerge pull request #2824 from wallabag/simplify-strings
Nicolas Lœuillet [Thu, 2 Feb 2017 14:35:22 +0000 (15:35 +0100)] 
Merge pull request #2824 from wallabag/simplify-strings

Renamed Developer section to API client management

7 years agoFreezed sensio/framework-extra-bundle version 2824/head
Nicolas Lœuillet [Thu, 2 Feb 2017 13:39:17 +0000 (14:39 +0100)] 
Freezed sensio/framework-extra-bundle version

7 years agoMerge pull request #2826 from wallabag/jlnostr-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 08:13:21 +0000 (09:13 +0100)] 
Merge pull request #2826 from wallabag/jlnostr-patch-1

Translate missing strings for de-DE.

7 years agoMerge pull request #2829 from wallabag/mruminski-patch-1
Jeremy Benoist [Thu, 2 Feb 2017 08:12:52 +0000 (09:12 +0100)] 
Merge pull request #2829 from wallabag/mruminski-patch-1

Update polish strings

7 years agoUpdate polish strings 2829/head
Mateusz Rumiński [Wed, 1 Feb 2017 21:29:03 +0000 (22:29 +0100)] 
Update polish strings

update missing polish strings

7 years agoTranslate missing strings for de-DE. 2826/head
Julian Oster [Wed, 1 Feb 2017 21:06:04 +0000 (22:06 +0100)] 
Translate missing strings for de-DE.

7 years agoUpdate german strings.
Julian Oster [Wed, 1 Feb 2017 20:29:59 +0000 (21:29 +0100)] 
Update german strings.

7 years agoRenamed Developer section to API client management
Nicolas Lœuillet [Wed, 1 Feb 2017 09:11:45 +0000 (10:11 +0100)] 
Renamed Developer section to API client management

7 years agoMerge pull request #2816 from wallabag/add-details-update
Nicolas Lœuillet [Tue, 31 Jan 2017 13:09:51 +0000 (14:09 +0100)] 
Merge pull request #2816 from wallabag/add-details-update

Added details about upgrade from 2.1.x or 2.2.0

7 years agoAdded details about upgrade from 2.1.x or 2.2.0 2816/head
Nicolas Lœuillet [Tue, 31 Jan 2017 11:53:22 +0000 (12:53 +0100)] 
Added details about upgrade from 2.1.x or 2.2.0

7 years agoMerge pull request #2812 from wallabag/prepare-221
Nicolas Lœuillet [Tue, 31 Jan 2017 10:31:45 +0000 (11:31 +0100)] 
Merge pull request #2812 from wallabag/prepare-221

Prepare wallabag 2.2.1 :rocket:

7 years agoPrepare wallabag 2.2.1 :rocket: 2812/head
Nicolas Lœuillet [Tue, 31 Jan 2017 10:06:35 +0000 (11:06 +0100)] 
Prepare wallabag 2.2.1 :rocket:

7 years agoMerge pull request #2809 from wallabag/fix-22-migrations
Nicolas Lœuillet [Tue, 31 Jan 2017 10:03:58 +0000 (11:03 +0100)] 
Merge pull request #2809 from wallabag/fix-22-migrations

Fixed duplicate entry for share_public in craue_setting_table

7 years agoAdded check in migration about uuid field 2809/head
Nicolas Lœuillet [Mon, 30 Jan 2017 20:21:49 +0000 (21:21 +0100)] 
Added check in migration about uuid field

7 years agoFixed duplicate entry for share_public in craue_setting_table
Nicolas Lœuillet [Mon, 30 Jan 2017 15:22:03 +0000 (16:22 +0100)] 
Fixed duplicate entry for share_public in craue_setting_table

7 years agoMerge pull request #2790 from wallabag/prepare-220
Nicolas Lœuillet [Fri, 27 Jan 2017 18:03:13 +0000 (19:03 +0100)] 
Merge pull request #2790 from wallabag/prepare-220

Prepare wallabag 2.2.0 🚀

7 years agoPrepare wallabag 2.2.0 :rocket: 2790/head
Nicolas Lœuillet [Fri, 27 Jan 2017 16:23:16 +0000 (17:23 +0100)] 
Prepare wallabag 2.2.0 :rocket:

7 years agoMerge pull request #2789 from wallabag/add-index-starred-archived
Nicolas Lœuillet [Fri, 27 Jan 2017 13:46:50 +0000 (14:46 +0100)] 
Merge pull request #2789 from wallabag/add-index-starred-archived

Added indexes on is_archived and is_starred

7 years agoFixed check on index 2789/head
Nicolas Lœuillet [Fri, 27 Jan 2017 11:10:52 +0000 (12:10 +0100)] 
Fixed check on index

7 years agoAdded indexes on is_archived and is_starred
Nicolas Lœuillet [Fri, 27 Jan 2017 10:44:04 +0000 (11:44 +0100)] 
Added indexes on is_archived and is_starred

7 years agoMerge pull request #2416 from wallabag/2.2
Jeremy Benoist [Fri, 27 Jan 2017 08:34:32 +0000 (09:34 +0100)] 
Merge pull request #2416 from wallabag/2.2

wallabag 2.2.0

7 years agoMerge remote-tracking branch 'origin/master' into 2.2 2416/head
Jeremy Benoist [Thu, 26 Jan 2017 12:32:07 +0000 (13:32 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.2