caubet_m 3a52f7ca26 Merge branch 'master' of https://git.psi.ch/lsm-hpce/merlin6

2019-06-28 16:31:41 +02:00

..

merlin6

Merge branch 'master' of https://git.psi.ch/lsm-hpce/merlin6

2019-06-28 16:31:41 +02:00

news

Merge pull request #75 from bogaotory/patch-1

2017-04-10 22:50:00 -07:00

tags

changed _pages to pages and removed include pages from config file. turned out this wasn't necessary.

2016-07-06 23:57:35 -07:00