Douwe Maan 4f44455626 Merge branch 'master' into user-ldap-email ...

# Conflicts:
#	db/schema.rb

2016-01-19 18:30:59 +01:00

..

fixtures

Seed db on development with artifacts metadata fixture

2016-01-14 12:48:14 +01:00

migrate

Merge branch 'master' into user-ldap-email

2016-01-19 18:30:59 +01:00

schema.rb

Merge branch 'master' into user-ldap-email

2016-01-19 18:30:59 +01:00

seeds.rb

init commit

2011-10-09 00:36:38 +03:00