Skip to content
Snippets Groups Projects
Commit a4b38178 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 782b14c0
Branches
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 5 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment