This repository has been archived on 2022-12-19. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.

Carlos Galindo cd465af904 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/main/java/es/kauron/estraba/controller/DashboardController.java # src/main/java/es/kauron/estraba/controller/SplashController.java # src/main/java/es/kauron/estraba/model/DataBundle.java		2016-05-24 14:40:47 +02:00
..
main	Merge remote-tracking branch 'origin/master'	2016-05-24 14:40:47 +02:00