fixed merge conflicts (df8edc55) · Commits · maspect / amiv-admintool · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

amiv-admintool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

df8edc55

Commit df8edc55 authored 8 years ago by Lukas Gygi

Downloads
- Plain Diff

fixed merge conflicts

parents 4cf87933 2afcd6bd

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

README.md 90 additions, 27 deletions

README.md
admin/index.html 69 additions, 53 deletions

admin/index.html
admin/lib/cust/main.css 99 additions, 94 deletions

admin/lib/cust/main.css
admin/lib/cust/main.js 146 additions, 115 deletions

admin/lib/cust/main.js
admin/tools/events.tool 123 additions, 122 deletions

admin/tools/events.tool
admin/tools/users.tool 41 additions, 29 deletions

admin/tools/users.tool
index.html 1 addition, 1 deletion

index.html
public/css/cards.css 2 additions, 0 deletions

public/css/cards.css
public/index.html 61 additions, 28 deletions

public/index.html

with 632 additions and 469 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment