Revision 1b6b5a64
ID | 1b6b5a64f6ebec6a6e412684f6560fb299286cea |
Merge remote-tracking branch 'origin/ui-0.8' into ui-0.8
Conflicts:
ui/templates/home.html
Files
- added
- modified
- copied
- renamed
- deleted
ID | 1b6b5a64f6ebec6a6e412684f6560fb299286cea |
Added by Kostas Papadimitriou over 12 years ago
Merge remote-tracking branch 'origin/ui-0.8' into ui-0.8
Conflicts:
ui/templates/home.html