Marin Jankovski 42fb42aed4 Merge branch 'master' into developer_can_push_to_protected_branches_option ... Conflicts: db/schema.rb		2014-12-29 09:30:55 +01:00
..
fixtures	Merge pull request #7894 from cirosantilli/fix-dev-user-seed	2014-12-20 20:18:15 +02:00
migrate	Merge branch 'master' into developer_can_push_to_protected_branches_option	2014-12-29 09:30:55 +01:00
schema.rb	Merge branch 'master' into developer_can_push_to_protected_branches_option	2014-12-29 09:30:55 +01:00
seeds.rb	init commit	2011-10-09 00:36:38 +03:00