From 8677d1b7bd5b32791c440bf0de2fc4c61c98299f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 21 May 2017 07:21:44 +0000
Subject: Merge from the diet branch.

  * refactored ./bin/genenetwork2 and /etc/default_settings
    - better detection of Guix
    - removed unused parameters, such as GEMMA_RESULT_PATH and TEMP_TRAITS
    - removing some default settings, such as PYLMM_COMMAND
    - rename some settings, such as SQL_URI and LOG_SQL_ALCHEMY
    - added GUIX_JS_PATH for JS modules
  * Added documentation on installing binary GN2
  * Updated Twitter board to latest version in Guix - it had broken
  * Updated many tools in the latest Guix profile
---
 etc/VERSION | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 etc/VERSION

(limited to 'etc/VERSION')

diff --git a/etc/VERSION b/etc/VERSION
new file mode 100644
index 00000000..1785aa28
--- /dev/null
+++ b/etc/VERSION
@@ -0,0 +1 @@
+2.10rc3
-- 
cgit v1.2.3