Merge branch 'develop' into 'mastopost'
authorlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000 (16:29 +0000)
commit839cb7b42404f86bdfcf043c5e8dbce08dd3928c
tree0917a5ac87708258d546397eb26bee5876a2eee6
parentb4292295d7fe629c6a29f221cab1deae1ec3008c
parent595ca3bb3a80eb3908a96b13c8b446296219a9c7
Merge branch 'develop' into 'mastopost'

# Conflicts:
#   .gitignore