Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mdietze authored Nov 24, 2023
2 parents 0be65ac + 797ff18 commit 6eec29f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/depends.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
R:
- "4.0"
- "4.1"
- "4.2"
- "4.3"
- "devel"

steps:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PEcAn is not itself an ecosystem model, and it can be used to with a variety of

## Documentation

Consult documentation of the PEcAn Project; either the [lastest stable development](https://pecanproject.github.io/pecan-documentation/develop/) branch, the latest [release](https://pecanproject.github.io/pecan-documentation/master/). Documentation from [earlier releases is here](https://pecanproject.github.io/documentation.html).
Consult documentation of the PEcAn Project; either the [latest stable development](https://pecanproject.github.io/pecan-documentation/develop/) branch, the latest [release](https://pecanproject.github.io/pecan-documentation/master/). Documentation from [earlier releases is here](https://pecanproject.github.io/documentation.html).

## Getting Started

Expand All @@ -47,7 +47,7 @@ This, however, may have limited functionality without also installing other comp

### Website

Visit our [webage](https://pecanproject.github.io) to keep up with latest news, version, and information about the PEcAn Project
Visit our [webpage](https://pecanproject.github.io) to keep up with latest news, version, and information about the PEcAn Project

#### Web Interface demo
The fastest way to begin modeling ecosystems is through the PEcAn web interface.
Expand Down
1 change: 1 addition & 0 deletions docker/depends/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get update \
jags \
time \
openssh-client \
patch \
rsync \
libgdal-dev \
libglpk-dev \
Expand Down

0 comments on commit 6eec29f

Please sign in to comment.