marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge /media/sdb1/gitRepositories/judo into promoInfo

Browse Source 
Conflicts:
	.gitignore
	homepage/redesign2018/markdownExperiment/wkParticipo/addFahrt.php
	homepage/redesign2018/markdownExperiment/wkParticipo/addStarter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/addStarterDev.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/addEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/addMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminAddStarter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminFunctions.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/adminUpdateStarterErgebnis.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/index.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/listUsers.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/newsLetter.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/resetPassword.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/reseteMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showFahrt.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/showUser.php
	homepage/redesign2018/markdownExperiment/wkParticipo/admin/verteileMitfahrer.php
	homepage/redesign2018/markdownExperiment/wkParticipo/calendar.php
	homepage/redesign2018/markdownExperiment/wkParticipo/changePassword.php
	homepage/redesign2018/markdownExperiment/wkParticipo/eventKalender.php
	homepage/redesign2018/markdownExperiment/wkParticipo/galImgPicker.php
	homepage/redesign2018/markdownExperiment/wkParticipo/horstWolfJudosport.php
	homepage/redesign2018/markdownExperiment/wkParticipo/index.php
	homepage/redesign2018/markdownExperiment/wkParticipo/infoZettel.php
	homepage/redesign2018/markdownExperiment/wkParticipo/login.php
	homepage/redesign2018/markdownExperiment/wkParticipo/loginDev.php
	homepage/redesign2018/markdownExperiment/wkParticipo/showWkEvent.php
	homepage/redesign2018/markdownExperiment/wkParticipo/userInfo.php
This commit is contained in:
marko
2018-09-27 05:20:00 +02:00
parent ee6dfed7e8 8af477fca8
commit 108dd3191c
362 changed files with 82680 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1 +1,5 @@
infoZettelOrg/*.pdf
photoalben/
!photoalben/**/*.php
!photoalben/**/*.css