Simon Wörner 4c13fd2b42 Revert "remove aspect sorting logic" ... This reverts commit 8d8d3c649a. Conflicts: app/assets/javascripts/main.js		2015-04-25 02:16:54 +02:00
..
images	Generate error pages on assets:precompile	2015-03-27 11:15:59 +01:00
javascripts	Revert "remove aspect sorting logic"	2015-04-25 02:16:54 +02:00
stylesheets	Merge branch 'release/0.5.0.0-RC' into develop	2015-04-21 20:48:41 +02:00
templates	Merge pull request #5850 from svbergerem/modal-for-new-aspect	2015-04-20 22:34:51 +02:00