senaduka/old-rijeci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
Senad Uka
2013-12-22 09:04:13 +01:00
parent c2a04384ef fa7835f174
commit a2909d55ef
60 changed files with 770 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/rijeci.iml generated
View File

@@ -167,7 +167,7 @@
<orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="execjs (v2.0.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="hike (v1.2.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.9, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jbuilder (v1.5.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.0.4, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
@@ -175,17 +175,15 @@
<orderEntry type="library" scope="PROVIDED" name="mime-types (v1.25.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="minitest (v4.7.5, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="oj (v2.4.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="polyglot (v0.3.3, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v1.5.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-cors (v0.2.9, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="railties (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.0, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12.2, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ridc (v0.0.7, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass (v3.2.12, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass (v3.2.13, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sass-rails (v4.0.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sdoc (v0.3.20, RVM: ruby-1.9.3-p194) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets (v2.10.1, RVM: ruby-1.9.3-p194) [gem]" level="application" />