Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links ...

Conflicts:
	spec/models/project_spec.rb

2014-01-24 14:02:11 +01:00

..

action_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

merge_action_spec.rb

Merge branch 'master' into reference_relative_links

2014-01-24 14:02:11 +01:00