Skip to content
Snippets Groups Projects
Commit 79344f5b authored by Michael Hamann's avatar Michael Hamann
Browse files

Merge branch 'jquery' 

Conflicts:
	lib/scripts/edit.js
	lib/scripts/locktimer.js

Some whitespace (at end of line) cleanup
parents 5ff12737 61a2640a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 291 additions and 279 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment