Valery Sizov 1a97c3c4aa Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict ...

Conflicts:
	CHANGELOG
	VERSION

2014-10-29 16:13:36 +02:00

..

admin

Merge branch '7-4-stable' into to_ee_stable_from_ce_stable

2014-10-20 19:59:36 +03:00

dashboard

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

explore

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

profile

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

project

Merge branch '7-4-stable' into ee_stable

2014-10-21 13:48:16 +03:00

snippets

Fix raw view for public snippets

2014-10-29 16:11:28 +02:00

steps

Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict

2014-10-29 16:13:36 +02:00

support

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00

groups.feature

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

search.feature

Save search options when switch between filter

2014-08-27 11:55:42 +03:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Add admin notification unsubscribe feature

2014-08-22 10:45:45 +02:00