Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
7416a566
Commit
7416a566
authored
Nov 10, 2011
by
Enrique García Cota
Browse files
Options
Browse Files
Download
Plain Diff
fixed conflict in .gitignore
parents
317da873
d97c98bd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
.gitignore
.gitignore
+1
-1
ohwr-theme
public/themes/ohwr-theme
+1
-1
No files found.
.gitignore
View file @
7416a566
...
...
@@ -23,4 +23,4 @@
*.rbc
doc/app
backup/smtp.yml
/
public/javascripts/piwik.js
public/javascripts/piwik.js
ohwr-theme
@
959a184c
Subproject commit
838463ae6a5255a2091671645bf7e43856c3b316
Subproject commit
959a184c69573a9b0cad08a36518bbc58168b9de
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment