Merge branch 'master' of codecrew.fi:bortal
Conflicts: code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java
Showing
with
964 additions
and
1264 deletions
183 Bytes
180 Bytes
105 Bytes
110 Bytes
119 Bytes
2.77 KB
2.76 KB
2.74 KB
2.76 KB
2.77 KB
2.77 KB
5.23 KB
16.4 KB
5.23 KB
-
Please register or sign in to post a comment