Merge branch 'master' into develop

Author: lasote

_themes/conan/layout.html

@@ -158,6 +158,10 @@
           {% include "breadcrumbs.html" %}
           <!--<select id="search" name="state" multiple="true" onchange="window.location = reldir + this.value;" style="width:90%"></select>
           <hr/>-->
+          <div class="admonition important">
+              Come and join <b><a href=https://conandays.conan.io>ConanDays</a></b>, a technical event bringing together all worldwide Conan users to share their experiences and contribute to the future of Conan. <b><a href=https://blog.conan.io/2019/11/05/ConanDays-Madrid-2020-international-community-gathering-Conan-package-manager.html>Read more about it here</a></b>. It will take place in Madrid, Spain, on March 19-20, 2020. <b><a href=https://sessionize.com/conandays-2020/>Submit a talk</a></b> and contribute to the community sharing your knowledge or <b><a href=https://www.eventbrite.com/e/conandays-2020-gathering-the-clans-tickets-75869891889>reserve your spot now!</a></b>
+          </div>
+
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             {% block body %}{% endblock %}

changelog.rst

@@ -22,6 +22,14 @@ Check https://github.com/conan-io/conan for issues and more details about develo
     Read more about the :ref:`Conan stability commitment<stability>`.
 
 
+1.20.4 (19-Nov-2019)
+--------------------
+
+- Feature: Added traces to `check_output` internal call to log the called command and the output as INFO traces (can be adjusted with `export CONAN_LOGGING_LEVEL=20`) `#6091 <https://github.com/conan-io/conan/pull/6091>`_
+- Bugfix: Using `scm` with `auto` values with a `conanfile.py` not being in the root scm folder it failed to export the right source code directory if not using `--ignore-dirty` and the repo was not pristine. `#6098 <https://github.com/conan-io/conan/pull/6098>`_
+- Bugfix: Fix `conan_build_info` command when conan_sources.tgz not present in remote. `#6088 <https://github.com/conan-io/conan/pull/6088>`_
+
+
 1.20.3 (11-Nov-2019)
 --------------------
 

conf.py

@@ -41,7 +41,7 @@
 # The short X.Y version.
 version = "1.20"
 # The full version, including alpha/beta/rc tags.
-release = u'1.20.3'
+release = u'1.20.4'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):