Avocet master merge - Githubissues

CUL-DigitalServices / avocet-ui

Open Academic Environment (OAE) Front-End

http://www.oaeproject.org

Educational Community License v2.0

1 stars 1 forks source link

Closed Coenego closed 10 years ago

Coenego commented 10 years ago

Merged with latest version of oaeproject/3akai-ux:master

Coenego commented 10 years ago

Assigning to @nicolaasmatthijs for review

nicolaasmatthijs commented 10 years ago

@Coenego : Looks like there is a merge conflict.

Coenego

Coenego commented 10 years ago