Skip to content
Snippets Groups Projects
Commit 75d986fe 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 2eb84351
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment