Revision 7cdd774d
ID | 7cdd774dc5c67ecc84fe1244bc24a97033826daa |
Merge branch 'master' into 1852_billing_period_calc
Conflicts:
src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala
Files
- added
- modified
- copied
- renamed
- deleted
ID | 7cdd774dc5c67ecc84fe1244bc24a97033826daa |
Added by Christos KK Loverdos over 12 years ago
Merge branch 'master' into 1852_billing_period_calc
Conflicts:
src/main/scala/gr/grnet/aquarium/user/UserDataSnapshot.scala