Nutzerverwaltung
parent: f14cbc | patch | commitdiff
ulrich
2016-12-17 59db0c72ece1e6ad24cd64616609faa0a3eb001b
refs
author ulrich <not disclosed>
Saturday, December 17, 2016 10:08 +0000
committer ulrich <not disclosed>
Saturday, December 17, 2016 10:08 +0000
commit59db0c72ece1e6ad24cd64616609faa0a3eb001b
tree c7c545726c4a3a0f5eae551bc021e6d5eb3258ec tree | zip | gz
parent f14cbcfae22f196e466983b9702ac7cceeb86aba view | diff
f4a79ccd85d6175cef27e081628dd013a0b6d77e view | diff 
Merge origin/master

Conflicts:
	web/ui/user.jsp
4 files modified
2 files added
217 ■■■■■ changed files
src/java/de/uhilger/um/api/UserMgr.java 4 ●●●●● diff | view | raw | blame | history
src/java/de/uhilger/um/web/NiceFilter.java 43 ●●●●● diff | view | raw | blame | history
web/WEB-INF/web.xml 28 ●●●●● diff | view | raw | blame | history
web/show.jsp 26 ●●●●● diff | view | raw | blame | history
web/ui/ui.js 102 ●●●●● diff | view | raw | blame | history
web/ui/user.jsp 14 ●●●●● diff | view | raw | blame | history