ling-js / skylax

Skylax Client
MIT License
4 stars 0 forks source link

New design with result tab #57

Closed SpeckiJ closed 6 years ago

Effizjens commented 6 years ago

We were not able to test the new design. Maybe we should wait, until the server is up again?

SpeckiJ commented 6 years ago

@Effizjens Just checking merge commits as I have modified the pug on the master branch as well.

There is currently 1 merge conflict where the Head of NewDesignWithResultTab reflects the correct status. The master is the old version and needs to be overwritten.

SpeckiJ commented 6 years ago

Apparently i have destroyed our master branch :( . I am therefore merging this branch now.