Dmitriy Zaporozhets 92ef845fa5 Merge branch 'master' into 6-0-dev ... Conflicts: VERSION		2013-07-12 16:16:20 +03:00
..
api	Merge branch 'master' into 6-0-dev	2013-07-12 14:42:35 +03:00
assets	…
backup	Merge pull request #4264 from andrewwutw/fix-postgresql-restore	2013-07-11 09:52:43 -07:00
gitlab	Merge branch 'master' into 6-0-dev	2013-07-12 14:42:35 +03:00
redcarpet/render	Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451	2013-07-07 19:00:07 +02:00
support	Merge branch 'master' into 6-0-dev	2013-07-12 16:16:20 +03:00
tasks	Merge branch 'master' into 6-0-dev	2013-07-12 14:42:35 +03:00
event_filter.rb	…
extracts_path.rb	…
file_size_validator.rb	…
static_model.rb	…