Nightblade73 bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf ...

# Conflicts:
#	src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
#	src/main/resources/db/changelog-master.xml

2019-04-24 22:41:48 +04:00

..

fragments

Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf

2019-04-24 22:41:48 +04:00

conference.html

Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf

2019-04-24 22:41:48 +04:00

conferences.html

#64 style fixes

2019-04-24 09:42:00 +04:00

dashboard.html

#68 added ping method

2019-04-24 21:05:25 +04:00