Nihad Abbasov 89fa800e28 Merge branch 'refs/heads/snippets_expiration' into dev ...

Conflicts:
	db/schema.rb

2011-10-28 00:28:37 +05:00

..

assets

Merge branch 'refs/heads/assets-refactoring' into dev

2011-10-27 14:51:05 +05:00

controllers

Merge branch 'dev' of dev.gitlabhq.com:gitlabhq into dev

2011-10-27 16:47:39 +03:00

helpers

refactor lifetime_select helper

2011-10-27 12:11:42 +05:00

mailers

v1.0

2011-10-13 04:00:00 +03:00

models

Merge branch 'refs/heads/snippets_expiration' into dev

2011-10-28 00:28:37 +05:00

uploaders

v1.0

2011-10-13 04:00:00 +03:00

views

Merge branch 'refs/heads/snippets_expiration' into dev

2011-10-28 00:28:37 +05:00