Skip to content

Commit

Permalink
added branch description to readme
Browse files Browse the repository at this point in the history
  • Loading branch information
stuhli committed Dec 7, 2018
1 parent e4bd617 commit 3d23a66
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion README.md
Expand Up @@ -27,7 +27,7 @@ The following functions are implemented for now:

DFIRTrack is developed for deploying on **Debian Stretch** or **Ubuntu 16.04**. Other *Debian* based distributions or versions may work but were not tested yet. At the moment the project will be focused on Ubuntu LTS and Debian releases.

For fast and uncomplicated installation on a dedicated server including all dependencies an [Ansible](https://docs.ansible.com/ansible/latest/) playbook and role was written (available [here](https://github.com/stuhli/dfirtrack_ansible)).
For fast and uncomplicated installation on a dedicated server including all dependencies an [Ansible](https://docs.ansible.com/ansible/latest/) playbook and role was written (available [here](https://github.com/stuhli/dfirtrack_ansible)). For testing a docker environment was prepared (see below).

For a minimal setup the following dependencies are needed:

Expand Down Expand Up @@ -73,6 +73,19 @@ The application was created by implementing the following libraries and code:
* [Open Iconic](https://github.com/iconic/open-iconic)
* [Popper.js](https://github.com/FezVrasta/popper.js)

## Development

There are two main branches:

* `master`
* `development`

The master branch should be stable (as you can expect from an alpha version).
New features and changes are added to the development branch and merged into master from time to time.
Everything merged into development should run too but might need manual changes (e. g. config).
[Devolopment branch](https://github.com/stuhli/dfirtrack_ansible/tree/develop) of DFIRTrack Ansible should follow these changes.
So if you want to see the latest features and progress: "check out" development.

## License

See `LICENSE` file in the root directory.
Expand Down

0 comments on commit 3d23a66

Please sign in to comment.