barwie2@st.amu.edu.pl 72fda159ce Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/Http/Controllers/User/UserSubjectsController.php		2019-12-16 15:46:03 +01:00
..
UserAttendancesController.php	export to xlsx added, map preview fixed	2019-12-14 22:03:41 +01:00
UserClassesController.php	Integracja z czytnikiem	2019-12-16 15:45:28 +01:00
UserSubjectsController.php	Merge remote-tracking branch 'origin/master'	2019-12-16 15:46:03 +01:00