Skip to content

Commit

Permalink
Merge branch 'maint-1.1'
Browse files Browse the repository at this point in the history 
* maint-1.1:
  docs: more complete list of past authors

* NOTE During merge, amended AUTHORS and THANKS file as per the new
  format, listing code contributions in the first and translation
  contributions in the second.

Conflicts:
	AUTHORS

Signed-off-by: Tibor Simko <[email protected]>
  • Loading branch information
@tiborsimko
tiborsimko committed Mar 3, 2015
2 parents 44dddc2 + 8318292 commit db167ac
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 423 deletions.
Loading

0 comments on commit db167ac

Please sign in to comment.