George Vinogradov
|
2dd99d32f9
|
Merge branch 'downloads'
First turn of merging.
Conflicts:
.gitignore
Gemfile
Gemfile.lock
config/locales/ru.yml
config/routes.rb
db/schema.rb
|
2011-10-20 19:22:11 +04:00 |
santaux
|
8103b14e15
|
[refs #1861] Add downloads statistics
|
2011-10-14 10:35:25 +04:00 |
|
George Vinogradov
|
229b4bb3f4
|
Created new models and provided relationships between them.
|
2011-10-13 19:55:03 +04:00 |
Vladimir Sharshov
|
2aae25a41b
|
Add new items to .gitignore
|
2011-09-15 21:54:59 +04:00 |
Timothy N. Tsvetkov
|
da811d763f
|
added public/system to gitignore
|
2011-04-14 21:05:13 +04:00 |
Alexey Nayden
|
73f7d4c0dd
|
Ignoring local settings
|
2011-04-12 11:39:05 +04:00 |
|
Timothy N. Tsvetkov
|
8839c68219
|
added public/stylsheets/comiped and public/assets to gitignore
|
2011-03-29 23:39:08 +04:00 |
|
Alexey Nayden
|
f99233061e
|
Merge branch 'master' of github.com:evilmartians/rosa-build
|
2011-03-10 13:50:05 +03:00 |
|
Alexey Nayden
|
5585f83ccd
|
Ignoring compiled css
|
2011-03-10 13:47:50 +03:00 |
|
Timothy N. Tsvetkov
|
3cbc1aeb78
|
merge
|
2011-03-10 13:23:36 +03:00 |
|
Timothy N. Tsvetkov
|
c23b0a7f6e
|
removed database.yml, added it to gitignore, added .idea to gitignore
|
2011-03-10 13:22:28 +03:00 |
|
Alexey Nayden
|
17b0d70a3c
|
database.yml fix
|
2011-03-10 13:21:57 +03:00 |
|
Alexey Nayden
|
eae3c46912
|
Initial commit
|
2011-03-09 16:13:36 +03:00 |