Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue' into...
Merge remote-tracking branch 'remotes/github/unified-frame-edit-view-vue' into unified-frame-edit-view-vue-dcz # Conflicts: # entries/templates/unification_lexical_unit_display.html
Showing
- entries/static/entries/js/components/LexicalUnitDisplay.js 85 additions, 5 deletionsentries/static/entries/js/components/LexicalUnitDisplay.js
- entries/static/entries/js/components/Spinner.js 12 additions, 0 deletionsentries/static/entries/js/components/Spinner.js
- entries/static/entries/js/components/main.js 24 additions, 19 deletionsentries/static/entries/js/components/main.js
- entries/static/entries/js/unification_entries_list.js 2 additions, 77 deletionsentries/static/entries/js/unification_entries_list.js
- entries/static/entries/js/unification_index.js 1 addition, 1 deletionentries/static/entries/js/unification_index.js
- entries/templates/unification_lexical_unit_display.html 58 additions, 68 deletionsentries/templates/unification_lexical_unit_display.html
- users/templates/notes.html 1 addition, 1 deletionusers/templates/notes.html
Please register or sign in to comment