Skip to content
Snippets Groups Projects
Commit 97499703 authored by Akdel's avatar Akdel
Browse files

Merge branches 'doc' and 'master' of https://git.wur.nl/durai001/caretta 

# Conflicts:
#	bin/caretta-app-demo
parent 75d986fe
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment