Marco Wahl
6311c12556
Merge branch 'maint'
2017-12-28 18:05:54 +01:00
Marco Wahl
b29a972307
org-inlinetask:Fix folding of inline tasks within plain list
...
This is the fix proposed by Nicolas. See
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00564.html
Add and accommodate some tests.
2017-12-28 17:59:52 +01:00
Nicolas Goaziou
401890986c
Revert "org-table: Improve bidirectional reordering in tables"
...
This reverts commit f4ae1941c9
.
2017-12-28 12:29:04 +01:00
Nicolas Goaziou
a88bd87787
Merge branch 'maint'
2017-12-27 23:57:37 +01:00
Adrian Bradd
ff0f3e4723
Fix `org-todo'
...
* org.el (org-todo): Use marker `change-plist' position property to
permit triggering through "org-depend.el" with parent heading
statistics.
When TODO statistics in parent headings were updated it shifted the point
defining the :position property in `change-plist' causing headlines
with TRIGGER properties to fail to evaluate.
TINYCHANGE
2017-12-27 23:57:15 +01:00
Nicolas Goaziou
01e150eb59
ox-publish: Cache results for `org-publish-find-date'
...
* lisp/ox-publish.el (org-publish-find-date): Cache results.
(org-publish-find-title): Tiny refactoring.
Reported-by: Lorenzo Bolla <lbolla@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00561.html >
2017-12-27 23:44:55 +01:00
Nicolas Goaziou
b30afa39b0
Merge branch 'maint'
2017-12-27 23:24:08 +01:00
Nicolas Goaziou
f2c712a6a4
Fix inserting link
...
* lisp/org.el (org-insert-link): Fix when search option in a file link
contains two consecutive slashes.
Reported-by: Ag Ibragimov <agzam.ibragimov@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00560.html >
2017-12-27 23:22:07 +01:00
Nicolas Goaziou
7b6ec64e0e
Merge branch 'maint'
2017-12-25 23:54:36 +01:00
Nicolas Goaziou
85ed1fd01d
Fix visibility cycling when point is invisible
...
* lisp/org.el (org-cycle-internal-local): Fix visibility cycling when
point is invisible.
Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00314.html >
2017-12-25 23:53:26 +01:00
Kyle Meyer
b9491c967c
Merge branch 'maint'
2017-12-25 12:35:42 -05:00
Kyle Meyer
5696f353dc
ob-haskell: Fix indentation from b46787743
...
This fails Emacs's pre-commit check (lisp/org/ob-haskell.el:77: space
before tab in indent).
2017-12-25 12:29:27 -05:00
Nicolas Goaziou
57a8dde8e3
Merge branch 'maint'
2017-12-25 00:14:51 +01:00
Nicolas Goaziou
b3ddb051e6
ob-exp: Fix source blocks generated by other source blocks
...
* lisp/ob-exp.el (org-babel-exp--at-source): Source blocks generated
by evaluating other source blocks may not be found in the original
buffer. In that case, do not move point.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00538.html >
2017-12-25 00:10:39 +01:00
Nicolas Goaziou
a343b0000a
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:42:46 +01:00
Nicolas Goaziou
f4ae1941c9
org-table: Improve bidirectional reordering in tables
...
* lisp/org-table.el (org-table-separator-space): New variable.
(org-table-align): Use new variable.
2017-12-23 23:37:45 +01:00
Nicolas Goaziou
4d3e7a2a57
ob-core: All Noweb parameters are read at point of definition
...
* lisp/ob-core.el (org-babel-params-from-properties): Do not force
using `org-babel-current-src-block-location'. Extract properties
from point.
(org-babel--noweb-reference): Remove function.
(org-babel-expand-noweb-references): Apply function removal. Small
refactoring.
* lisp/ob-lob.el (org-babel-lob-get-info): Small refactoring.
2017-12-23 15:56:53 +01:00
Nicolas Goaziou
38be851245
ob-core: Do not always evaluate Lisp code in parameters
...
* lisp/ob-core.el (org-babel-get-src-block-info):
(org-babel-params-from-properties):
(org-babel-parse-header-arguments): Add optional argument disabling
Lisp evaluation in parameters.
2017-12-23 15:45:03 +01:00
Nicolas Goaziou
1e40dd6486
ob-core: Tiny refactoring
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Tiny
refactoring.
2017-12-23 14:03:52 +01:00
Nicolas Goaziou
774e553f11
Merge branch 'maint'
2017-12-23 14:03:47 +01:00
Nicolas Goaziou
d9125e435f
Fix recursive Noweb expansion
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Recursive Noweb
expansion obey to :noweb parameter.
* testing/lisp/test-ob.el (test-ob/noweb-expansion): Add tests.
Fixes: 17523
2017-12-23 13:58:25 +01:00
Nicolas Goaziou
7e77560ebb
Merge branch 'maint'
2017-12-22 19:22:06 +01:00
Nicolas Goaziou
bac8d25441
org-clock: Fix timezone in `org-clock-get-sum-start'
...
* lisp/org-clock.el (org-clock-get-sum-start): Remove timezone
argument from `encode-time'.
Reported-by: Ihor Radchenko <ihor_radchenko@mymail.sutd.edu.sg>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00499.html >
2017-12-22 19:19:49 +01:00
Kaushal Modi
6e95e088e8
Merge branch 'maint'
2017-12-20 17:15:52 -05:00
Kaushal Modi
4f3fc9cb20
Fix double-escaping of # and ![ in Markdown export
...
* lisp/ox-md.el (org-md-plain-text): Fix the order of replacements in
plain text.
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00460.html >
2017-12-20 13:18:55 -05:00
Nicolas Goaziou
3acc212c8f
ob-core: Get :noweb-ref from definition instead of point of call
...
* lisp/ob-core.el (org-babel-expand-noweb-references): Get :noweb-ref
from definition instead of point of call.
* testing/lisp/test-ob.el (test-ob/noweb-expansion-1):
(test-ob/noweb-expansion-2): Merge tests. Add test.
2017-12-20 13:15:08 +01:00
Nicolas Goaziou
291d90c53e
ob-core: Correctly find Noweb reference
...
* lisp/ob-core.el (org-babel--noweb-reference): New function.
(org-babel-expand-noweb-references): Use new function.
2017-12-20 13:01:53 +01:00
Nicolas Goaziou
1822f6eb62
Merge branch 'maint'
2017-12-19 20:29:21 +01:00
Neil Jerram
4932e2197a
Fix Scheme evaluation in fresh Emacs
...
* lisp/ob-scheme.el: Require geiser-impl so that
geiser-default-implementation is defined. Otherwise, unless Geiser
has previously been run (e.g. with `run-geiser'), you'll see an
error that geiser-default-implementation is undefined.
2017-12-19 20:27:44 +01:00
Kyle Meyer
06b49cd837
Merge branch 'maint'
2017-12-19 00:00:49 -05:00
Jack Kamm
b506bb68d0
ob-python: Fix :session :results output multiline behavior
...
* lisp/ob-python.el (orb-babel-python-evaluate-session): When :session
:results output, send multiline code blocks to tmpfile and execute in
Python with exec().
(org-babel-python--exec-tmpfile): New variable.
* testing/lisp/test-ob-python.el (test-ob-python/session-multiline):
Test for :session with multiple lines and indentation.
2017-12-18 23:59:04 -05:00
Nicolas Goaziou
fdb2eb6701
Preserve file local variables during some operations
...
* lisp/org-macs.el (org-preserve-local-variables): New macro.
* lisp/org-footnote.el (org-footnote--clear-footnote-section):
(org-footnote--goto-local-insertion-point):
(org-footnote-create-definition):
(org-footnote-delete):
(org-footnote-renumber-fn:N):
(org-footnote-sort):
(org-footnote-normalize):
* lisp/org.el (org-move-subtree-down):
(org-copy-subtree):
(org-sort-entries):
(org-refile): Use new macro.
* testing/lisp/test-org-footnote.el (test-org-footnote/normalize):
(test-org-footnote/delete):
(test-org-footnote/sort):
(test-org-footnote/normalize):
* testing/lisp/test-org.el (test-org/sort-entries): Add tests.
Operations affected include copying, killing, refiling, archiving and
moving subtrees. It also affects sorting, creating and deleting
footnotes.
2017-12-18 16:01:41 +01:00
Nicolas Goaziou
9bbee7d3c8
Add some `:safe' keywords
...
* lisp/org-src.el (org-edit-src-content-indentation):
* lisp/org.el (org-adapt-indentation): Add :safe keyword.
2017-12-17 11:01:25 +01:00
Nicolas Goaziou
3ac619c8ac
org-macro: Placeholders in (eval ...) macros are always strings
...
* lisp/org-macro.el (org-macro-initialize-templates): Update
templates.
(org-macro-expand): Ensure placeholders in "eval" macros are strings.
* testing/lisp/test-org-macro.el (test-org/macro-replace-all): Update
tests.
2017-12-17 09:40:56 +01:00
Marco Wahl
3f2968c650
org: Insert a blank with structure template type "src"
2017-12-16 18:17:10 +01:00
Nicolas Goaziou
6ffcdcbf02
Merge branch 'maint'
2017-12-16 13:45:43 +01:00
Nicolas Goaziou
84cb63a44a
ox: Fix plain text export with `org-export-with-backend'
...
* lisp/ox.el (org-export-with-backend): Handle arity for plain text
transcoder.
* testing/lisp/test-ox.el (test-org-export/with-backend): Add test.
2017-12-16 13:44:56 +01:00
Nicolas Goaziou
1992394148
org-duration: Remove unnecessary declaration
2017-12-15 23:23:49 +01:00
Nicolas Goaziou
c9bbc4eca7
Merge branch 'maint'
2017-12-15 23:21:34 +01:00
Nicolas Goaziou
5e30bbcd34
Silence byte-compiler
2017-12-15 23:21:15 +01:00
Nicolas Goaziou
9a24977571
Merge branch 'maint'
2017-12-15 22:50:38 +01:00
Nicolas Goaziou
aab7f65a8b
ox-latex: Merge check-boxes with bullets
...
* lisp/ox-latex.el (org-latex-item): Do not display both bullet and
checkbox.
Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00225.html >
2017-12-15 22:48:57 +01:00
Nicolas Goaziou
2646271789
Merge branch 'maint'
2017-12-15 22:26:01 +01:00
Nicolas Goaziou
46124812d2
Fix function declarations
...
Fixes: 29722
2017-12-15 22:24:44 +01:00
Nicolas Goaziou
5d4691dfbf
Merge branch 'maint'
2017-12-15 00:00:55 +01:00
Nicolas Goaziou
327ca051ae
ob-ref: Fix parsing arguments with a newline character
...
* lisp/ob-ref.el (org-babel-ref-split-regexp): Remove variable.
(org-babel-ref-parse): Handle arguments containing a newline
character (e.g., strings).
* testing/lisp/test-ob-lob.el (test-ob-lob/assignment-with-newline):
New test.
2017-12-15 00:00:30 +01:00
Nicolas Goaziou
6fc4a1c53b
Merge branch 'maint'
2017-12-14 22:40:55 +01:00
Nicolas Goaziou
fe98379fce
Fix fuzzy link escaping
...
* lisp/org.el (org-make-link-string): Properly escape square brackets
and percent sings in fuzzy links.
* testing/lisp/test-org-clock.el (test-org-clock/clocktable/link):
Update tests.
Reported-by: Paulo Matos <paulo@matos-sorge.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00269.html >
2017-12-14 22:39:54 +01:00
Nicolas Goaziou
60831c4606
Merge branch 'maint'
2017-12-14 00:40:58 +01:00
Nicolas Goaziou
263a0cf00e
Fix defcustom type
...
* lisp/org-agenda.el (org-agenda-custom-commands-local-options):
* lisp/org-duration.el (org-duration-units):
* lisp/org.el (org-occur-case-fold-search): Remove spurious quote.
Fixes: 29694
lignes
2017-12-14 00:40:27 +01:00
Nicolas Goaziou
bbf39576f4
org-tempo: Fix typo
...
* lisp/org-tempo.el (org-tempo-tags): Fix typo
2017-12-14 00:25:59 +01:00
Nicolas Goaziou
5d2517ba5a
Merge branch 'maint'
2017-12-14 00:18:20 +01:00
Nicolas Goaziou
d9a6408baf
Fix defgroups
...
* lisp/org.el (org-structure-template-alist): Use `org-edit-structure'
instead of non-existent `org-completion'.
* lisp/ox-publish.el (org-export-publish): Rename from `org-publish'.
* lisp/org-pcomplete.el (org-complete): Remove unused group.
Fixes: 29698
2017-12-14 00:16:18 +01:00
Nicolas Goaziou
a36d18caa4
Merge branch 'maint'
2017-12-13 23:52:06 +01:00
Nicolas Goaziou
08fa2ae056
Fix some defcustoms types
...
* lisp/ob-stan.el (org-babel-stan-cmdstan-directory):
* lisp/org.el (org-latex-default-packages-alist):
* lisp/ox-odt.el (org-odt-with-latex): Fix type mismatch.
Fixes: 29695
2017-12-13 23:51:10 +01:00
Nicolas Goaziou
2390b6302d
Merge branch 'maint'
2017-12-11 23:21:07 +01:00
Nicolas Goaziou
0dde39ccd3
org-archive: Fix point after archiving to sibling
...
* lisp/org-archive.el (org-archive-to-archive-sibling): Move point in
a consistent way upon archiving to a sibling.
Reported-by: Allen Li <vianchielfaura@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00158.html >
2017-12-11 23:19:40 +01:00
Nicolas Goaziou
e8b71b86d2
Merge branch 'maint'
2017-12-11 15:14:01 +01:00
Doro Rose
b467877437
Fix ob-haskell.el to work with custom ghci prompts
...
* lisp/ob-haskell.el (haskell-prompt-regexp): Define defvar
`haskell-prompt-regexp`. This variable will override the variable set by
inf-haskell, when `org-babel-execute:haskell` is called.
(org-babel-execute:haskell): Make sure that
`comint-prompt-regexp` is set appropriately to enable correct parsing
of "λ"-prompts. Set `comint-preoutput-filter-functions` appropriately to
enable correct parsing of coloured ghci prompts.
The problem was that code sent back from the inf-haskell buffer to
org-babel wasn't parsed correctly in `org-babel-comint-with-output`.
This occured when the user uses the commonly used "λ"-prompt.
TINYCHANGE
2017-12-11 15:11:56 +01:00
Nicolas Goaziou
c3c1c52eb8
ox: Fix inline source block evaluation
...
* lisp/ox.el (org-export-as): Specifically expand {{{results}}} macro
after Babel code execution.
* testing/lisp/test-ox.el (test-org-export/expand-macro): Add test.
Reported-by: "Berry, Charles" <ccberry@ucsd.edu>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00202.html >
2017-12-11 14:56:57 +01:00
Nicolas Goaziou
076cba6b2d
Fix last commit
...
* lisp/org.el (org-show-all): Remove function.
2017-12-10 23:50:30 +01:00
Nicolas Goaziou
6f89177ee6
Move `org-unlogged-message' to "org-macs.el"
...
* lisp/org.el (org-unlogged-message): Move function to...
* lisp/org-macs.el: ... here.
2017-12-10 23:37:59 +01:00
Nicolas Goaziou
fc5abc2d55
ob-core: Insert lowercase results
...
* lisp/ob-core.el (org-babel-insert-result): Insert lower case blocks
and drawers.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--results-wrap):
(test-ob/org-babel-remove-result--results-org):
(test-ob/org-babel-remove-result--results-html):
(test-ob/org-babel-remove-result--results-latex):
(test-ob/org-babel-remove-result--results-code): Update tests.
2017-12-10 23:05:32 +01:00
Nicolas Goaziou
a34431f6ea
org-tempo: Tiny refactoring
...
* lisp/org-tempo.el (org-tempo--include-file): Tiny refactoring.
2017-12-10 17:11:24 +01:00
Rasmus
3efb000739
org-tempo: Enable Tempo in all Org buffers after load
...
* lisp/org-tempo.el: Enable Org Tempo in all buffers after load.
Reported-by: Charles Berry <ccberry@ucsd.edu>
http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00172.html
2017-12-10 12:01:09 +01:00
Rasmus
94f1a58438
org-tempo.el: New file for expansion of templates
...
* lisp/org-tempo.el: New file.
* doc/org.texi (Structure templates):
* lisp/org.el (org-modules): Add org-tempo.
* testing/lisp/test-org-tempo.el: New file.
2017-12-08 00:29:08 +01:00
Nicolas Goaziou
d435c75f54
Merge branch 'maint'
2017-12-07 14:20:33 +01:00
Eric S Fraga
1187538a21
Allow gnuplot to generate plots in different directories
...
* lisp/ob-gnuplot.el (org-babel-expand-body:gnuplot) if the Org buffer
is associated with a file, direct gnuplot to change to the directory
for that file.
2017-12-07 14:20:06 +01:00
Nicolas Goaziou
3695415199
Merge branch 'maint'
2017-12-06 23:16:55 +01:00
Nicolas Goaziou
b570175d76
Fix `org-files-list'
...
* lisp/org.el (org-files-list): Prevent duplicates in result.
Reported-by: Renato Ferreira <renatofdds@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-12/msg00134.html >
2017-12-06 23:15:59 +01:00
Nicolas Goaziou
15df8db7ad
Merge branch 'maint'
2017-12-04 22:43:31 +01:00
Nicolas Goaziou
0e7e3bc6df
Remove some references to reserved keybinding prefix `C-c a'
...
* lisp/org-agenda.el (org-stuck-projects):
(org-agenda-menu):
* lisp/org.el (org-org-menu): Remove references to reserved keybinding
prefix `C-c a'.
Fixes: 28263
2017-12-04 22:42:16 +01:00
Nicolas Goaziou
494414028a
Merge branch 'maint'
2017-12-04 22:21:25 +01:00
Nicolas Goaziou
66754e9042
org-feed: Fix parsing <guid>
...
* lisp/org-feed.el (org-feed-parse-rss-feed): Fix regexp for <guid>.
Fixes: 27711
2017-12-04 22:20:25 +01:00
Nicolas Goaziou
f8db6e0295
Merge branch 'maint'
2017-12-04 18:55:29 +01:00
Nicolas Goaziou
d3f7309cbd
org-irc: Silence byte-compiler
2017-12-04 18:55:03 +01:00
Nicolas Goaziou
ada2f64b16
org-attach: Make `org-attach-directory' a safe variable
...
* lisp/org-attach.el (org-attach-directory): Add :safe keyword.
2017-12-04 14:55:20 +01:00
Nicolas Goaziou
0c691737aa
Merge branch 'maint'
2017-12-04 08:24:19 +01:00
thibault
e22ee8b8a3
Fix bug in HTML export of code blocks with starting blank lines
...
* lisp/ox-html.el (org-html-do-format-code): Preverse starting blank
lines when splitting code lines (use `split-string' instead of
`org-split-string').
(org-html-fontify-code): Preserve starting blank lines in returned
code string.
2017-12-04 08:24:02 +01:00
Nicolas Goaziou
a0e3f1d505
Merge branch 'maint'
2017-12-03 18:14:48 +01:00
Nicolas Goaziou
037db00f40
Fix last commit
...
* lisp/org.el (org-org-menu): Fix last commit.
2017-12-03 18:14:21 +01:00
Nicolas Goaziou
7fc901ca0f
Merge branch 'maint'
2017-12-03 18:04:18 +01:00
Nicolas Goaziou
b4079bb894
Activate CDLatex entry in menu only if `cdlatex' is loaded
...
* lisp/org.el (org-org-menu): Activate CDLatex entry in menu only if
`cdlatex' is loaded.
Fixes: 4068
2017-12-03 18:03:19 +01:00
Nicolas Goaziou
ff36e945ca
Merge branch 'maint'
2017-12-03 16:24:49 +01:00
Nicolas Goaziou
efe440adbe
org-gnus: Silence byte-compiler
...
Fixes: 29329
2017-12-03 16:22:45 +01:00
Nicolas Goaziou
259656a76e
Merge branch 'maint'
2017-12-03 09:03:37 +01:00
Nicolas Goaziou
2faaacfeeb
Revert the whole time zone mess
...
* lisp/org.el (org-time-string-to-time):
(org-time-string-to-seconds): Remove optional ZONE argument.
(org-2ft):
(org-check-before-date):
(org-check-after-date):
(org-check-dates-range):
(org-parse-time-string):
* lisp/org-clock.el (org-clock-get-sum-start):
(org-clock-out):
(org-clock-timestamps-change):
(org-clock-sum):
(org-clock-update-time-maybe):
* lisp/org-colview.el (org-columns--age-to-minutes): Apply change.
* testing/lisp/test-org-clock.el (org-test-clock-create-clock):
(test-org-clock/clocktable/scope):
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
Apply change. Simplify tests to avoid daylight saving time issue.
2017-12-03 08:57:37 +01:00
Nicolas Goaziou
14620fdf0c
Yet another tweak to fontification
...
* lisp/org.el (org-do-emphasis-faces): Handle properly asterisks at
the beginning of line.
2017-12-02 23:21:36 +01:00
Nicolas Goaziou
8bd9839952
Revert "Fix headline fontification"
...
This reverts commit 5873d99121
.
2017-12-02 23:07:51 +01:00
Nicolas Goaziou
bdaf5dacf4
Merge branch 'maint'
2017-12-02 17:27:53 +01:00
Nicolas Goaziou
ca43c1f262
Fix RET past the last column of a table
...
* lisp/org.el (org-return): Split the table before first column or
after last one.
* lisp/org-table.el (org-table-next-row): Remove code handling split.
* testing/lisp/test-org.el (test-org/return): Add test.
2017-12-02 17:23:03 +01:00
Nicolas Goaziou
0ace32b045
Merge branch 'maint'
2017-12-02 12:23:02 +01:00
Nicolas Goaziou
f53d1e2005
Let `or-export-last-sibling-p' handle discontinuous headlines
...
* lisp/ox.el (org-export-last-sibling-p): Handle discontinuous
headlines.
* testing/lisp/test-ox.el (test-org-export/last-sibling-p): Add test.
Fixes: 24836
2017-12-02 12:22:32 +01:00
Nicolas Goaziou
7a3cae65a7
Merge branch 'maint'
2017-12-01 19:35:54 +01:00
Nicolas Goaziou
0cc231a7bb
Call store link functions only once
...
* lisp/org.el (org-store-link): Call store link functions only once.
Fixes: 19914
2017-12-01 19:33:35 +01:00
Nicolas Goaziou
1bb9cf1597
Merge branch 'maint'
2017-11-29 23:02:42 +01:00
Matt Lundin
dd3bf50adf
Preserve point when storing link in Gnus nnir groups
...
* lisp/org-gnus.el: (org-gnus-store-link) This fixes a similar issue
as commit 84b329516e
, but for
nnir search groups in gnus.
2017-11-29 21:05:19 +01:00
Nicolas Goaziou
326b2e85e4
Merge branch 'maint'
2017-11-29 19:03:22 +01:00
Matt Lundin
84b329516e
Preserve position of point in gnus virtual group
...
* lisp/org-gnus.el: (org-gnus-store-link) Add a save-excursion to
protect the position of point. Otherwise, when calling org-capture
in an article with a virtual group, the point is moved and the
region captured is incorrect.
2017-11-29 19:02:57 +01:00
Nicolas Goaziou
fada34bb97
Merge branch 'maint'
2017-11-29 15:10:48 +01:00