Commit Graph

3 Commits

Author SHA1 Message Date
Torkel Ödegaard
6632f883c0 Merge branch 'master' into export-dashboard
Conflicts:
	.floo
	.flooignore
2016-05-18 08:08:15 +02:00
Torkel Ödegaard
4ea3002572 added floobits stuff 2016-05-16 14:02:34 +02:00
Torkel Ödegaard
ca8df67947 feat(import): things are starting to work 2016-05-13 11:26:02 +02:00